diff options
| author | Colin Cross <ccross@android.com> | 2017-06-26 10:11:30 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2017-06-26 10:12:24 -0700 |
| commit | eeefff50de27aca421ceb152cb0f85115a11f5f4 (patch) | |
| tree | 99b3bb5e1756b311ccbde265e61786a55afbbe45 | |
| parent | e6ff9bad3850625f6f52c6c890b4f60ed6d5a732 (diff) | |
| download | jdk8u_hotspot-eeefff50de27aca421ceb152cb0f85115a11f5f4.tar.gz | |
Fix clang 4.0 errors
Clang 4.0 errors if a pointer is compared > 0. Switch to != NULL
instead.
Change-Id: Ibccb00327f21ddb48e7d5b2915da74b00ded3fd9
| -rw-r--r-- | src/share/vm/opto/lcm.cpp | 2 | ||||
| -rw-r--r-- | src/share/vm/runtime/virtualspace.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/share/vm/opto/lcm.cpp b/src/share/vm/opto/lcm.cpp index dd93b0fb9..d7aa25357 100644 --- a/src/share/vm/opto/lcm.cpp +++ b/src/share/vm/opto/lcm.cpp @@ -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 diff --git a/src/share/vm/runtime/virtualspace.cpp b/src/share/vm/runtime/virtualspace.cpp index 14dbd74b1..66392b75f 100644 --- a/src/share/vm/runtime/virtualspace.cpp +++ b/src/share/vm/runtime/virtualspace.cpp @@ -342,7 +342,7 @@ ReservedHeapSpace::ReservedHeapSpace(size_t size, size_t alignment, (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); } |