# HG changeset patch
# User adlertz
# Date 1389260860 -3600
# Node ID ef54656d5a654cc2ebee7bfc4127706dd5263b7f
# Parent  849eb7bfceac271a3fd170ffe998e2e95166689f
8011391: C1: assert(code_offset() - offset == NativeInstruction::nop_instruction_size) failed: only one instruction can go in a delay slot
Summary: Remove the VerifyOopMaps flag which doesn't work for tiered or for C1 with more compiler threads than one.
Reviewed-by: twisti, drchase, iveresov

diff -r 849eb7bfceac -r ef54656d5a65 src/share/vm/c1/c1_LIRAssembler.cpp
--- a/src/share/vm/c1/c1_LIRAssembler.cpp	Wed Jan 08 10:25:50 2014 -0800
+++ b/src/share/vm/c1/c1_LIRAssembler.cpp	Thu Jan 09 10:47:40 2014 +0100
@@ -858,9 +858,7 @@
 
 void LIR_Assembler::verify_oop_map(CodeEmitInfo* info) {
 #ifndef PRODUCT
-  if (VerifyOopMaps || VerifyOops) {
-    bool v = VerifyOops;
-    VerifyOops = true;
+  if (VerifyOops) {
     OopMapStream s(info->oop_map());
     while (!s.is_done()) {
       OopMapValue v = s.current();
@@ -883,7 +881,6 @@
 
       s.next();
     }
-    VerifyOops = v;
   }
 #endif
 }
diff -r 849eb7bfceac -r ef54656d5a65 src/share/vm/c1/c1_globals.hpp
--- a/src/share/vm/c1/c1_globals.hpp	Wed Jan 08 10:25:50 2014 -0800
+++ b/src/share/vm/c1/c1_globals.hpp	Thu Jan 09 10:47:40 2014 +0100
@@ -269,9 +269,6 @@
   develop(bool, PrintNotLoaded, false,                                      \
           "Prints where classes are not loaded during code generation")     \
                                                                             \
-  notproduct(bool, VerifyOopMaps, false,                                    \
-          "Adds oopmap verification code to the generated code")            \
-                                                                            \
   develop(bool, PrintLIR, false,                                            \
           "print low-level IR")                                             \
                                                                             \