archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8011391: C1: assert(code_offset() - offset == NativeInstruction::nop_instruction_size) failed: only one instruction can go in a delay slot

Browse source 
Remove the VerifyOopMaps flag which doesn't work for tiered or for C1 with more compiler threads than one.

Reviewed-by: twisti, drchase, iveresov
This commit is contained in:
Niclas Adlertz 2014-01-09 10:47:40 +01:00
parent ba7149bbda
commit f0e34eb09c
2 changed files with 1 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
hotspot/src/share/vm/c1/c1_LIRAssembler.cpp
View file

@ -858,9 +858,7 @@ void LIR_Assembler::move_op(LIR_Opr src, LIR_Opr dest, BasicType type, LIR_Patch
void LIR_Assembler::verify_oop_map(CodeEmitInfo* info) { void LIR_Assembler::verify_oop_map(CodeEmitInfo* info) {
#ifndef PRODUCT #ifndef PRODUCT
if (VerifyOopMaps || VerifyOops) { if (VerifyOops) {
bool v = VerifyOops;
VerifyOops = true;
OopMapStream s(info->oop_map()); OopMapStream s(info->oop_map());
while (!s.is_done()) { while (!s.is_done()) {
OopMapValue v = s.current(); OopMapValue v = s.current();
@ -883,7 +881,6 @@ void LIR_Assembler::verify_oop_map(CodeEmitInfo* info) {
s.next(); s.next();
} }
VerifyOops = v;
} }
#endif #endif
} }

3
hotspot/src/share/vm/c1/c1_globals.hpp
View file

@ -269,9 +269,6 @@
develop(bool, PrintNotLoaded, false, \ develop(bool, PrintNotLoaded, false, \
"Prints where classes are not loaded during code generation") \ "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, \ develop(bool, PrintLIR, false, \
"print low-level IR") \ "print low-level IR") \
\ \