src/hotspot/cpu/x86/templateTable_x86.cpp

rev 51719 : [mq]: 8210676

*** 2873,2883 ****
  
    if (!is_static) pop_and_check_object(obj);
  
    const Address field(obj, off, Address::times_1, 0*wordSize);
  
!   Label Done, notByte, notBool, notInt, notShort, notChar, notLong, notFloat, notObj, notDouble;
  
    __ shrl(flags, ConstantPoolCacheEntry::tos_state_shift);
    // Make sure we don't need to mask edx after the above shift
    assert(btos == 0, "change code, btos != 0");
  
--- 2873,2883 ----
  
    if (!is_static) pop_and_check_object(obj);
  
    const Address field(obj, off, Address::times_1, 0*wordSize);
  
!   Label Done, notByte, notBool, notInt, notShort, notChar, notLong, notFloat, notObj;
  
    __ shrl(flags, ConstantPoolCacheEntry::tos_state_shift);
    // Make sure we don't need to mask edx after the above shift
    assert(btos == 0, "change code, btos != 0");
  
*** 2979,2988 ****
--- 2979,2989 ----
    }
    __ jmp(Done);
  
    __ bind(notFloat);
  #ifdef ASSERT
+   Label notDouble;
    __ cmpl(flags, dtos);
    __ jcc(Assembler::notEqual, notDouble);
  #endif
    // dtos
    __ access_load_at(T_DOUBLE, IN_HEAP, noreg /* dtos */, field, noreg, noreg);
*** 3130,3140 ****
    // field addresses
    const Address field(obj, off, Address::times_1, 0*wordSize);
    NOT_LP64( const Address hi(obj, off, Address::times_1, 1*wordSize);)
  
    Label notByte, notBool, notInt, notShort, notChar,
!         notLong, notFloat, notObj, notDouble;
  
    __ shrl(flags, ConstantPoolCacheEntry::tos_state_shift);
  
    assert(btos == 0, "change code, btos != 0");
    __ andl(flags, ConstantPoolCacheEntry::tos_state_mask);
--- 3131,3141 ----
    // field addresses
    const Address field(obj, off, Address::times_1, 0*wordSize);
    NOT_LP64( const Address hi(obj, off, Address::times_1, 1*wordSize);)
  
    Label notByte, notBool, notInt, notShort, notChar,
!         notLong, notFloat, notObj;
  
    __ shrl(flags, ConstantPoolCacheEntry::tos_state_shift);
  
    assert(btos == 0, "change code, btos != 0");
    __ andl(flags, ConstantPoolCacheEntry::tos_state_mask);
*** 3284,3293 ****
--- 3285,3295 ----
      __ jmp(Done);
    }
  
    __ bind(notFloat);
  #ifdef ASSERT
+   Label notDouble;
    __ cmpl(flags, dtos);
    __ jcc(Assembler::notEqual, notDouble);
  #endif
  
    // dtos