X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fvm%2Fjit%2Fjit.cpp;h=a8ac2b160a196c7f7c1873db3e80bf196fab7e86;hb=1ac1bfb96df7e855bdf9947f9794bd23d921b067;hp=095e9840155dba245ac7ec97a0a07909feaa1efb;hpb=56fa24a4902f1e71f5d057487097f9438222f4b9;p=cacao.git

diff --git a/src/vm/jit/jit.cpp b/src/vm/jit/jit.cpp
index 095e98401..a8ac2b160 100644
--- a/src/vm/jit/jit.cpp
+++ b/src/vm/jit/jit.cpp
@@ -32,11 +32,11 @@
 
 #include "md.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/native.hpp"
 
-#include "toolbox/logging.h"
+#include "toolbox/logging.hpp"
 
 #include "threads/mutex.hpp"
 
@@ -45,7 +45,7 @@
 #include "vm/globals.hpp"
 #include "vm/initialize.hpp"
 #include "vm/loader.hpp"
-#include "vm/method.h"
+#include "vm/method.hpp"
 #include "vm/options.h"
 #include "vm/rt-timing.h"
 #include "vm/statistics.h"
@@ -58,7 +58,7 @@
 #include "vm/jit/disass.h"
 #include "vm/jit/dseg.h"
 #include "vm/jit/jit.hpp"
-#include "vm/jit/parse.h"
+#include "vm/jit/parse.hpp"
 #include "vm/jit/reg.h"
 
 #include "vm/jit/show.hpp"
@@ -80,7 +80,7 @@
 #endif
 
 #if defined(ENABLE_INLINING)
-# include "vm/jit/inline/inline.h"
+# include "vm/jit/inline/inline.hpp"
 #endif
 
 #include "vm/jit/ir/bytecode.h"
@@ -99,7 +99,7 @@
 # include "vm/jit/python.h"
 #endif
 
-#include "vm/jit/verify/typecheck.h"
+#include "vm/jit/verify/typecheck.hpp"
 
 
 /* debug macros ***************************************************************/
@@ -389,14 +389,6 @@ u1 *jit_compile(methodinfo *m)
 		/* release codeinfo */
 
 		code_codeinfo_free(jd->code);
-
-#if defined(ENABLE_PROFILING)
-		/* Release memory for basic block profiling information. */
-
-		if (JITDATA_HAS_FLAG_INSTRUMENT(jd))
-			if (jd->code->bbfrequency != NULL)
-				MFREE(jd->code->bbfrequency, u4, jd->code->basicblockcount);
-#endif
 	}
 	else {
 		DEBUG_JIT_COMPILEVERBOSE("Running: ");
@@ -774,8 +766,10 @@ static u1 *jit_compile_intern(jitdata *jd)
 	   _must_ be done after loop optimization and register allocation,
 	   since they can change the basic block count. */
 
-	if (JITDATA_HAS_FLAG_INSTRUMENT(jd))
+	if (JITDATA_HAS_FLAG_INSTRUMENT(jd)) {
+		code->basicblockcount = jd->basicblockcount;
 		code->bbfrequency = MNEW(u4, jd->basicblockcount);
+	}
 #endif
 
 	DEBUG_JIT_COMPILEVERBOSE("Generating code: ");