--- a/src/share/vm/code/codeBlob.cpp	Thu Mar 07 15:17:51 2013 +0100
+++ b/src/share/vm/code/codeBlob.cpp	Thu Mar 07 21:00:29 2013 +0100
@@ -39,7 +39,6 @@
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/vframe.hpp"
 #include "services/memoryService.hpp"
-#include "utilities/machineCodePrinter.hpp"
 #ifdef TARGET_ARCH_x86
 # include "nativeInst_x86.hpp"
 #endif
@@ -134,11 +133,10 @@
   cb->copy_code_and_locs_to(this);
   set_oop_maps(oop_maps);
   _frame_size = frame_size;
-#if defined(COMPILER1) || defined(GRAAL)
-
+#ifdef COMPILER1
   // probably wrong for tiered
   assert(_frame_size >= -1, "must use frame size or -1 for runtime stubs");
-#endif // COMPILER1 || GRAAL
+#endif // COMPILER1
 }
 
 
@@ -345,10 +343,6 @@
 
   trace_new_stub(stub, "RuntimeStub - ", stub_name);
 
-  if (PrintMachineCodeToFile) {
-    MachineCodePrinter::print(stub);
-  }
-
   return stub;
 }
 
@@ -384,7 +378,9 @@
   _unpack_offset           = unpack_offset;
   _unpack_with_exception   = unpack_with_exception_offset;
   _unpack_with_reexecution = unpack_with_reexecution_offset;
+#ifdef COMPILER1
   _unpack_with_exception_in_tls   = -1;
+#endif
 }