OpenJDK / jdk / jdk
changeset 46983:1c9cefa2a443
8174050: Compilation errors with clang-4.0
Reviewed-by: kvn
| author | martin |
|---|---|
| date | Thu, 24 Aug 2017 10:26:32 -0700 |
| parents | 2e6921bc9f8e |
| children | b2fae0ac76d4 1294e2eb56eb |
| files | hotspot/src/share/vm/memory/virtualspace.cpp hotspot/src/share/vm/opto/lcm.cpp hotspot/src/share/vm/opto/loopPredicate.cpp |
| diffstat | 3 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/hotspot/src/share/vm/memory/virtualspace.cpp Thu Aug 24 23:54:53 2017 +0000 +++ b/hotspot/src/share/vm/memory/virtualspace.cpp Thu Aug 24 10:26:32 2017 -0700 @@ -582,7 +582,7 @@ assert(markOopDesc::encode_pointer_as_mark(&_base[size])->decode_pointer() == &_base[size], "area must be distinguishable from marks for mark-sweep"); - if (base() > 0) { + if (base() != NULL) { MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap); } }
--- a/hotspot/src/share/vm/opto/lcm.cpp Thu Aug 24 23:54:53 2017 +0000 +++ b/hotspot/src/share/vm/opto/lcm.cpp Thu Aug 24 10:26:32 2017 -0700 @@ -39,7 +39,7 @@ // Check whether val is not-null-decoded compressed oop, // i.e. will grab into the base of the heap if it represents NULL. static bool accesses_heap_base_zone(Node *val) { - if (Universe::narrow_oop_base() > 0) { // Implies UseCompressedOops. + if (Universe::narrow_oop_base() != NULL) { // Implies UseCompressedOops. if (val && val->is_Mach()) { if (val->as_Mach()->ideal_Opcode() == Op_DecodeN) { // This assumes all Decodes with TypePtr::NotNull are matched to nodes that
--- a/hotspot/src/share/vm/opto/loopPredicate.cpp Thu Aug 24 23:54:53 2017 +0000 +++ b/hotspot/src/share/vm/opto/loopPredicate.cpp Thu Aug 24 10:26:32 2017 -0700 @@ -912,7 +912,7 @@ Node* idx = cmp->in(1); assert(!invar.is_invariant(idx), "index is variant"); Node* rng = cmp->in(2); - assert(rng->Opcode() == Op_LoadRange || _igvn.type(rng)->is_int() >= 0, "must be"); + assert(rng->Opcode() == Op_LoadRange || iff->is_RangeCheck() || _igvn.type(rng)->is_int()->_lo >= 0, "must be"); assert(invar.is_invariant(rng), "range must be invariant"); int scale = 1; Node* offset = zero;