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

     1.1 --- a/src/cpu/x86/vm/x86_64.ad	Wed Sep 25 17:47:51 2013 +0200
     1.2 +++ b/src/cpu/x86/vm/x86_64.ad	Thu Sep 26 10:25:02 2013 -0400
     1.3 @@ -529,7 +529,7 @@
     1.4    if (rspec.reloc()->type() == relocInfo::oop_type &&
     1.5        d32 != 0 && d32 != (intptr_t) Universe::non_oop_word()) {
     1.6      assert(Universe::heap()->is_in_reserved((address)(intptr_t)d32), "should be real oop");
     1.7 -    assert(oop((intptr_t)d32)->is_oop() && (ScavengeRootsInCode || !oop((intptr_t)d32)->is_scavengable()), "cannot embed scavengable oops in code");
     1.8 +    assert(cast_to_oop((intptr_t)d32)->is_oop() && (ScavengeRootsInCode || !cast_to_oop((intptr_t)d32)->is_scavengable()), "cannot embed scavengable oops in code");
     1.9    }
    1.10  #endif
    1.11    cbuf.relocate(cbuf.insts_mark(), rspec, format);
    1.12 @@ -556,7 +556,7 @@
    1.13    if (rspec.reloc()->type() == relocInfo::oop_type &&
    1.14        d64 != 0 && d64 != (int64_t) Universe::non_oop_word()) {
    1.15      assert(Universe::heap()->is_in_reserved((address)d64), "should be real oop");
    1.16 -    assert(oop(d64)->is_oop() && (ScavengeRootsInCode || !oop(d64)->is_scavengable()),
    1.17 +    assert(cast_to_oop(d64)->is_oop() && (ScavengeRootsInCode || !cast_to_oop(d64)->is_scavengable()),
    1.18             "cannot embed scavengable oops in code");
    1.19    }
    1.20  #endif