diff jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java @ 23366:45168ac6d3bc

Merge.
author Roland Schatz <roland.schatz@oracle.com>
date Fri, 29 Apr 2016 11:10:18 +0200
parents 30af491f98c5 b05ad394cfd5
children 802821d82a92
line wrap: on
line diff
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java	Fri Apr 29 10:54:19 2016 +0200
+++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java	Fri Apr 29 11:10:18 2016 +0200
@@ -510,7 +510,7 @@
             fieldCache.put(id, result);
         } else {
             assert result.getName().equals(fieldName);
-            // assert result.getType().equals(type);
+            assert result.getType().equals(type);
             assert result.offset() == offset;
             assert result.getModifiers() == flags;
         }
@@ -903,4 +903,9 @@
     public String toString() {
         return "HotSpotType<" + getName() + ", resolved>";
     }
+
+    @Override
+    public boolean isAllocationCloneable() {
+        return (getAccessFlags() & config().jvmAccIsCloneable) != 0;
+    }
 }