src/cpu/x86/vm/assembler_x86.cpp

*** 8333,8351 ****
    assert (UseCompressedOops, "should only be used for compressed headers");
    assert (Universe::heap() != NULL, "java heap should be initialized");
    // Cannot assert, unverified entry point counts instructions (see .ad file)
    // vtableStubs also counts instructions in pd_code_size_limit.
    // Also do not verify_oop as this is called by verify_oop.
-   if (Universe::narrow_oop_base() == NULL) {
      if (Universe::narrow_oop_shift() != 0) {
-       assert (LogMinObjAlignmentInBytes == Universe::narrow_oop_shift(), "decode alg wrong");
-       shlq(r, LogMinObjAlignmentInBytes);
-     }
-   } else {
        assert (Address::times_8 == LogMinObjAlignmentInBytes &&
                Address::times_8 == Universe::narrow_oop_shift(), "decode alg wrong");
      leaq(r, Address(r12_heapbase, r, Address::times_8, 0));
    }
  }
  
  void  MacroAssembler::decode_heap_oop_not_null(Register dst, Register src) {
    assert (UseCompressedOops, "should only be used for compressed headers");
--- 8333,8349 ----
    assert (UseCompressedOops, "should only be used for compressed headers");
    assert (Universe::heap() != NULL, "java heap should be initialized");
    // Cannot assert, unverified entry point counts instructions (see .ad file)
    // vtableStubs also counts instructions in pd_code_size_limit.
    // Also do not verify_oop as this is called by verify_oop.
    if (Universe::narrow_oop_shift() != 0) {
      assert (Address::times_8 == LogMinObjAlignmentInBytes &&
              Address::times_8 == Universe::narrow_oop_shift(), "decode alg wrong");
+     // Don't use Shift since it modifies flags.
      leaq(r, Address(r12_heapbase, r, Address::times_8, 0));
+   } else {
+     assert (Universe::narrow_oop_base() == NULL, "sanity");
    }
  }
  
  void  MacroAssembler::decode_heap_oop_not_null(Register dst, Register src) {
    assert (UseCompressedOops, "should only be used for compressed headers");
*** 8356,8365 ****
--- 8354,8364 ----
    if (Universe::narrow_oop_shift() != 0) {
      assert (Address::times_8 == LogMinObjAlignmentInBytes &&
              Address::times_8 == Universe::narrow_oop_shift(), "decode alg wrong");
      leaq(dst, Address(r12_heapbase, src, Address::times_8, 0));
    } else if (dst != src) {
+     assert (Universe::narrow_oop_base() == NULL, "sanity");
      movq(dst, src);
    }
  }
  
  void  MacroAssembler::set_narrow_oop(Register dst, jobject obj) {