changeset 8958:61523d110335

8174050: Compilation errors with clang-4.0 Reviewed-by: tschatzl, kvn Contributed-by: Leslie Zhai <lesliezhai-hotspot@llvm.org.cn>
author tschatzl
date Mon, 30 Jul 2018 10:28:40 +0200
parents c93b08ae0485
children 9a18c71dbd25
files src/share/vm/opto/lcm.cpp src/share/vm/opto/loopPredicate.cpp src/share/vm/runtime/virtualspace.cpp
diffstat 3 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/opto/lcm.cpp	Fri Jul 27 06:47:12 2018 -0700
+++ b/src/share/vm/opto/lcm.cpp	Mon Jul 30 10:28:40 2018 +0200
@@ -49,7 +49,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/src/share/vm/opto/loopPredicate.cpp	Fri Jul 27 06:47:12 2018 -0700
+++ b/src/share/vm/opto/loopPredicate.cpp	Mon Jul 30 10:28:40 2018 +0200
@@ -869,7 +869,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 || _igvn.type(rng)->is_int()->_lo >= 0, "must be");
       assert(invar.is_invariant(rng), "range must be invariant");
       int scale    = 1;
       Node* offset = zero;
--- a/src/share/vm/runtime/virtualspace.cpp	Fri Jul 27 06:47:12 2018 -0700
+++ b/src/share/vm/runtime/virtualspace.cpp	Mon Jul 30 10:28:40 2018 +0200
@@ -342,7 +342,7 @@
                 (UseCompressedOops && (Universe::narrow_oop_base() != NULL) &&
                  Universe::narrow_oop_use_implicit_null_checks()) ?
                   lcm(os::vm_page_size(), alignment) : 0) {
-  if (base() > 0) {
+  if (base() != NULL) {
     MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap);
   }