X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fvm%2Fjit%2Foptimizing%2Fbytecode_escape.c;h=0d95b2070f27b0503391cae15c7e9e314b92012b;hb=4e25f6be9878154a9a7ae28917ed34427cb8ca6a;hp=2d7044bc65b3ef3acfb74f60638e876275658180;hpb=0698bb7e6153d5892e5ccdb9d9770999b1e1c217;p=cacao.git

diff --git a/src/vm/jit/optimizing/bytecode_escape.c b/src/vm/jit/optimizing/bytecode_escape.c
index 2d7044bc6..0d95b2070 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.
@@ -28,12 +28,12 @@
 #include <stdint.h>
 
 #include "mm/dumpmemory.hpp"
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "toolbox/bitvector.h"
 
 #include "vm/class.hpp"
-#include "vm/descriptor.h"
+#include "vm/descriptor.hpp"
 #include "vm/global.h"
 #include "vm/references.h"
 #include "vm/resolve.hpp"
@@ -775,12 +775,7 @@ 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);
-		}
-	}
+	descriptor_params_from_paramtypes(md, opc == BC_invokestatic ? ACC_STATIC : 0);
 
 	/* Try to lazyly resolve method. */
 
@@ -1867,3 +1862,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:
+ */
+