X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fvm%2Fexceptions.c;h=bfc8ce68752c11129d106bcd6c9b453b207893d7;hb=d75b6037acf17c342166b9c9bd6e657dfdd12cd9;hp=2091b548f4e7280e41a2a1d969908d9474366898;hpb=7d8c359a29e6cd2db255619a11bb131f6d490557;p=cacao.git

diff --git a/src/vm/exceptions.c b/src/vm/exceptions.c
index 2091b548f..bfc8ce687 100644
--- a/src/vm/exceptions.c
+++ b/src/vm/exceptions.c
@@ -1,9 +1,9 @@
 /* vm/exceptions.c - exception related functions
 
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-   R. Grafl, A. Krall, C. Kruegel, C. Oates, R. Obermaisser,
-   M. Probst, S. Ring, E. Steiner, C. Thalinger, D. Thuernbeck,
-   P. Tomsich, J. Wenninger
+   Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates,
+   R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner,
+   C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger,
+   Institut f. Computersprachen - TU Wien
 
    This file is part of CACAO.
 
@@ -26,7 +26,7 @@
 
    Authors: Christian Thalinger
 
-   $Id: exceptions.c 1621 2004-11-30 13:06:55Z twisti $
+   $Id: exceptions.c 1735 2004-12-07 14:33:27Z twisti $
 
 */
 
@@ -45,6 +45,7 @@
 #include "vm/tables.h"
 #include "vm/jit/asmpart.h"
 #include "vm/jit/jit.h"
+#include "vm/options.h"
 
 
 /* system exception classes required in cacao */
@@ -459,6 +460,7 @@ java_objectheader *new_verifyerror(methodinfo *m, char *message)
 	char *msg;
 	s4 len;
 
+	useinlining = false; /* at least until sure inlining works with exceptions*/
 	len = 8 + utf_strlen(m->class->name) +
 		10 + utf_strlen(m->name) +
 		13 + utf_strlen(m->descriptor) +