Mercurial > hg > truffle

diff src/share/vm/c1/c1_LIRAssembler.cpp @ 14233:1f480770a1d4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author adlertz
date Thu, 09 Jan 2014 10:47:40 +0100
parents de6a9e811145
children d8041d695d19 15766b73dc1d
line wrap: on
line diff
--- 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
 }