changeset 49033:f40ccb7ff62b exp

[Exp] Fixed windows build
author thartmann
date Tue, 20 Feb 2018 17:46:20 +0100
parents bab484349467
children c05f7dacae42
files src/hotspot/share/oops/klass.cpp src/hotspot/share/oops/klass.inline.hpp
diffstat 2 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/hotspot/share/oops/klass.cpp	Tue Feb 13 12:15:26 2018 +0100
+++ b/src/hotspot/share/oops/klass.cpp	Tue Feb 20 17:46:20 2018 +0100
@@ -174,12 +174,12 @@
   // Pad size in case need adjust to even/odd klass ptr
   uintptr_t addr = (uintptr_t) Metaspace::allocate(loader_data, word_size + (1 << LogKlassAlignment), MetaspaceObj::ClassType, THREAD);
   // values are odd, otherwise make even (and vice versa)
-  if (is_value ^ ((addr & KlassPtrEvenOddMask) >> LogKlassAlignmentInBytes)) {
+  if (is_value ^ (((addr & KlassPtrEvenOddMask) >> LogKlassAlignmentInBytes) != 0)) {
 	  addr += (1 << LogKlassAlignmentInBytes);
   }
-  assert(is_aligned(addr, (1 << LogKlassAlignmentInBytes)), "Klass base alignment incorrect");
-  assert(is_value || (addr & KlassPtrEvenOddMask) == 0,     "Klass even alignment incorrect");
-  assert((!is_value) || (addr & KlassPtrEvenOddMask),       "Klass odd alignment incorrect");
+  assert(is_aligned(addr, (1 << LogKlassAlignmentInBytes)),  "Klass base alignment incorrect");
+  assert(is_value || ((addr & KlassPtrEvenOddMask) == 0),    "Klass even alignment incorrect");
+  assert((!is_value) || ((addr & KlassPtrEvenOddMask) != 0), "Klass odd alignment incorrect");
   return (void*) addr;
 }
 
--- a/src/hotspot/share/oops/klass.inline.hpp	Tue Feb 13 12:15:26 2018 +0100
+++ b/src/hotspot/share/oops/klass.inline.hpp	Tue Feb 20 17:46:20 2018 +0100
@@ -72,10 +72,10 @@
 }
 
 inline bool Klass::decode_ptr_is_value_based(narrowKlass v) {
-	return (v & Universe::oop_metadata_odd_mask());
+	return (v & Universe::oop_metadata_odd_mask()) != 0;
 }
 inline bool Klass::ptr_is_value_based(Klass* v) {
-	return ((uintptr_t)v & Universe::oop_metadata_odd_mask());
+	return ((uintptr_t)v & Universe::oop_metadata_odd_mask()) != 0;
 }