X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=cacao.git;a=blobdiff_plain;f=src%2Fvm%2Fjit%2Foptimizing%2Fbytecode_escape.c;h=0ee6d19b5b8a6eff77961ec879e48b94aeb65c33;hp=82db44003bf577987776683cb87dbf8f39ad8577;hb=00f70baa559d938988363d68f416f684760d92a2;hpb=4963b824de21cc3f098e06782212ee0736b2c552

diff --git a/src/vm/jit/optimizing/bytecode_escape.c b/src/vm/jit/optimizing/bytecode_escape.c
index 82db44003..0ee6d19b5 100644
--- a/src/vm/jit/optimizing/bytecode_escape.c
+++ b/src/vm/jit/optimizing/bytecode_escape.c
@@ -1,6 +1,6 @@
 /* src/vm/optimizing/bytecode_escape.c
 
-   Copyright (C) 2008
+   Copyright (C) 1996-2011
    CACAOVM - Verein zu Foerderung der freien virtuellen Machine CACAO
 
    This file is part of CACAO.
@@ -19,21 +19,27 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
+
 */
 
-#include "mm/dumpmemory.h"
-#include "mm/memory.h"
+
+#include "config.h"
+
+#include <stdint.h>
+
+#include "mm/dumpmemory.hpp"
+#include "mm/memory.hpp"
 
 #include "toolbox/bitvector.h"
 
+#include "vm/class.hpp"
+#include "vm/descriptor.hpp"
 #include "vm/global.h"
+#include "vm/references.h"
+#include "vm/resolve.hpp"
+
 #include "vm/jit/ir/bytecode.h"
 #include "vm/jit/optimizing/escape.h"
-#include "vm/resolve.h"
-
-#include "vmcore/class.h"
-#include "vmcore/descriptor.h"
-#include "vmcore/references.h"
 
 #include <assert.h>
 #include <stdarg.h>
@@ -769,12 +775,8 @@ static void bc_escape_analysis_parse_invoke(bc_escape_analysis_t *be, jcode_t *j
 
 	/* Parse parameters if not done yet. */
 
-	if (md->params == NULL) {
-		if (! descriptor_params_from_paramtypes(md, opc == BC_invokestatic ? ACC_STATIC : 0)) {
-			/* TODO */
-			assert(0);
-		}
-	}
+	if (md->params == NULL)
+		descriptor_params_from_paramtypes(md, opc == BC_invokestatic ? ACC_STATIC : 0);
 
 	/* Try to lazyly resolve method. */
 
@@ -1861,3 +1863,18 @@ void bc_escape_analysis_perform(methodinfo *m) {
 }
 
 
+
+/*
+ * These are local overrides for various environment variables in Emacs.
+ * Please do not remove this and leave it at the end of the file, where
+ * Emacs will automagically detect them.
+ * ---------------------------------------------------------------------
+ * Local variables:
+ * mode: c
+ * indent-tabs-mode: t
+ * c-basic-offset: 4
+ * tab-width: 4
+ * End:
+ * vim:noexpandtab:sw=4:ts=4:
+ */
+