--- a/src/share/vm/graal/graalCompilerToVM.cpp	Thu Mar 22 19:06:04 2012 -0700
+++ b/src/share/vm/graal/graalCompilerToVM.cpp	Fri Mar 23 12:12:35 2012 -0700
@@ -62,10 +62,14 @@
   if (RewriteBytecodes || RewriteFrequentPairs) {
     BytecodeStream s(method);
     while(!s.is_last_bytecode()) {
-      jbyte code = s.next();
-      env->SetByteArrayRegion(result, s.bci(), 1, &code);
+      s.next();
+      Bytecodes::Code code = s.raw_code();
+      if (!Bytecodes::is_java_code(code)) {
+        jbyte original_code = Bytecodes::java_code(code);
+        env->SetByteArrayRegion(result, s.bci(), 1, &original_code);
+      }
     }
-  }
+  }  
 
   // replace all breakpoints
   if (method->number_of_breakpoints() > 0) {