Hacky source code changes. Probably should not need these. ihse-cflags-rewrite-branch
authorihse
Thu, 14 Jun 2018 15:46:19 +0200 (2018-06-14)
branchihse-cflags-rewrite-branch
changeset 56898 96b5af7d4202
parent 56760 8a18c7457c88
child 56899 2c5e7f347c49
Hacky source code changes. Probably should not need these.
src/hotspot/share/libadt/set.hpp
src/hotspot/share/opto/memnode.hpp
src/hotspot/share/opto/node.hpp
--- a/src/hotspot/share/libadt/set.hpp	Thu Jun 14 15:34:19 2018 +0200
+++ b/src/hotspot/share/libadt/set.hpp	Thu Jun 14 15:46:19 2018 +0200
@@ -120,7 +120,7 @@
 
   // Creates a new set from an existing set
   // DO NOT CONSTRUCT A Set.  THIS IS AN ABSTRACT CLASS, FOR INHERITENCE ONLY
-  Set(const Set &) {};
+  Set(const Set &s) : ResourceObj(s) {};
 
   // Set assignment; deep-copy guts
   virtual Set &operator =(const Set &s)=0;
--- a/src/hotspot/share/opto/memnode.hpp	Thu Jun 14 15:34:19 2018 +0200
+++ b/src/hotspot/share/opto/memnode.hpp	Thu Jun 14 15:46:19 2018 +0200
@@ -240,7 +240,7 @@
   // Following method is copied from TypeNode:
   void set_type(const Type* t) {
     assert(t != NULL, "sanity");
-    debug_only(uint check_hash = (VerifyHashTableKeys && _hash_lock) ? hash() : NO_HASH);
+    debug_only(uint check_hash = (VerifyHashTableKeys && _hash_lock) ? hash() : (uint)NO_HASH);
     *(const Type**)&_type = t;   // cast away const-ness
     // If this node is in the hash table, make sure it doesn't need a rehash.
     assert(check_hash == NO_HASH || check_hash == hash(), "type change must preserve hash code");
--- a/src/hotspot/share/opto/node.hpp	Thu Jun 14 15:34:19 2018 +0200
+++ b/src/hotspot/share/opto/node.hpp	Thu Jun 14 15:46:19 2018 +0200
@@ -542,7 +542,7 @@
   }
   // Swap input edge order.  (Edge indexes i1 and i2 are usually 1 and 2.)
   void swap_edges(uint i1, uint i2) {
-    debug_only(uint check_hash = (VerifyHashTableKeys && _hash_lock) ? hash() : NO_HASH);
+    debug_only(uint check_hash = (VerifyHashTableKeys && _hash_lock) ? hash() : (uint)NO_HASH);
     // Def-Use info is unchanged
     Node* n1 = in(i1);
     Node* n2 = in(i2);
@@ -1705,7 +1705,7 @@
 public:
   void set_type(const Type* t) {
     assert(t != NULL, "sanity");
-    debug_only(uint check_hash = (VerifyHashTableKeys && _hash_lock) ? hash() : NO_HASH);
+    debug_only(uint check_hash = (VerifyHashTableKeys && _hash_lock) ? hash() : (uint)NO_HASH);
     *(const Type**)&_type = t;   // cast away const-ness
     // If this node is in the hash table, make sure it doesn't need a rehash.
     assert(check_hash == NO_HASH || check_hash == hash(), "type change must preserve hash code");