Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/cpu/x86/vm/assembler_x86.cpp	Fri Dec 16 12:46:17 2011 -0800
     1.2 +++ b/src/cpu/x86/vm/assembler_x86.cpp	Mon Dec 19 15:34:09 2011 -0500
     1.3 @@ -5968,7 +5968,9 @@
     1.4    assert(number_of_arguments >= 0   , "cannot have negative number of arguments");
     1.5    LP64_ONLY(assert(java_thread == r15_thread, "unexpected register"));
     1.6  #ifdef ASSERT
     1.7 -  LP64_ONLY(if (UseCompressedOops) verify_heapbase("call_VM_base");)
     1.8 +  // TraceBytecodes does not use r12 but saves it over the call, so don't verify
     1.9 +  // r12 is the heapbase.
    1.10 +  LP64_ONLY(if (UseCompressedOops && !TraceBytecodes) verify_heapbase("call_VM_base");)
    1.11  #endif // ASSERT
    1.12  
    1.13    assert(java_thread != oop_result  , "cannot use the same register for java_thread & oop_result");