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

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
comparison
equal deleted inserted replaced
14232:183bd5c00828 14233:1f480770a1d4
856 } 856 }
857 857
858 858
859 void LIR_Assembler::verify_oop_map(CodeEmitInfo* info) { 859 void LIR_Assembler::verify_oop_map(CodeEmitInfo* info) {
860 #ifndef PRODUCT 860 #ifndef PRODUCT
861 if (VerifyOopMaps || VerifyOops) { 861 if (VerifyOops) {
862 bool v = VerifyOops;
863 VerifyOops = true;
864 OopMapStream s(info->oop_map()); 862 OopMapStream s(info->oop_map());
865 while (!s.is_done()) { 863 while (!s.is_done()) {
866 OopMapValue v = s.current(); 864 OopMapValue v = s.current();
867 if (v.is_oop()) { 865 if (v.is_oop()) {
868 VMReg r = v.reg(); 866 VMReg r = v.reg();
881 check_codespace(); 879 check_codespace();
882 CHECK_BAILOUT(); 880 CHECK_BAILOUT();
883 881
884 s.next(); 882 s.next();
885 } 883 }
886 VerifyOops = v; 884 }
887 } 885 #endif
888 #endif 886 }
889 }