--- a/src/share/vm/code/codeBlob.cpp	Mon Dec 03 13:56:13 2012 +0100
+++ b/src/share/vm/code/codeBlob.cpp	Mon Dec 03 15:32:17 2012 +0100
@@ -134,10 +134,11 @@
   cb->copy_code_and_locs_to(this);
   set_oop_maps(oop_maps);
   _frame_size = frame_size;
-#ifdef COMPILER1
+#if defined(COMPILER1) || defined(GRAAL)
+
   // probably wrong for tiered
   assert(_frame_size >= -1, "must use frame size or -1 for runtime stubs");
-#endif // COMPILER1
+#endif // COMPILER1 || GRAAL
 }
 
 
@@ -383,7 +384,7 @@
   _unpack_offset           = unpack_offset;
   _unpack_with_exception   = unpack_with_exception_offset;
   _unpack_with_reexecution = unpack_with_reexecution_offset;
-#ifdef COMPILER1
+#if defined(COMPILER1) || defined(GRAAL)
   _unpack_with_exception_in_tls   = -1;
 #endif
 }