Distinguish arrays and hybrids in layout encoding.

Author: peter-hofer

substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GreyToBlackObjectVisitor.java

@@ -166,7 +166,7 @@ public void printDiagnostics(Log log, ErrorContext context, int maxDiagnosticLev
                         DynamicHub hub = (DynamicHub) headerHub.toObject();
                         log.string("  class: ").string(hub.getName());
                         Object entryAsObject = objectEntry.toObject();
-                        if (LayoutEncoding.isArray(entryAsObject)) {
+                        if (LayoutEncoding.isArrayLike(entryAsObject)) {
                             int length = ArrayLengthNode.arrayLength(entryAsObject);
                             log.string("  length: ").signed(length);
                         }

substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ThreadLocalAllocation.java

@@ -294,7 +294,7 @@ private static Object slowPathNewArrayWithoutAllocating(DynamicHub hub, int leng
 
     @Uninterruptible(reason = "Holds uninitialized memory.")
     private static Object allocateInstanceInNewTlab(DynamicHub hub, AlignedHeader newTlabChunk) {
-        UnsignedWord size = LayoutEncoding.getInstanceSize(hub.getLayoutEncoding());
+        UnsignedWord size = LayoutEncoding.getPureInstanceSize(hub.getLayoutEncoding());
         Pointer memory = allocateRawMemoryInNewTlab(size, newTlabChunk);
         return FormatObjectNode.formatObject(memory, DynamicHub.toClass(hub), false, FillContent.WITH_ZEROES, true);
     }

substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/GenScavengeAllocationSnippets.java

@@ -102,7 +102,7 @@ public Object formatObjectSnippet(Word memory, DynamicHub hub, boolean remembere
                     @ConstantParameter AllocationSnippetCounters snippetCounters) {
         DynamicHub hubNonNull = (DynamicHub) PiNode.piCastNonNull(hub, SnippetAnchorNode.anchor());
         int layoutEncoding = hubNonNull.getLayoutEncoding();
-        UnsignedWord size = LayoutEncoding.getInstanceSize(layoutEncoding);
+        UnsignedWord size = LayoutEncoding.getPureInstanceSize(layoutEncoding);
         Word objectHeader = encodeAsObjectHeader(hubNonNull, rememberedSet, false);
         return formatObject(objectHeader, size, memory, fillContents, emitMemoryBarrier, false, snippetCounters);
     }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/DebugHelper.java

@@ -315,7 +315,7 @@ private static boolean isObjectArray(DynamicHub hub) {
 
     @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
     private static boolean isInstance(DynamicHub hub) {
-        return LayoutEncoding.isInstance(hub.getLayoutEncoding());
+        return LayoutEncoding.isPureInstance(hub.getLayoutEncoding());
     }
 
     @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/Hybrid.java

@@ -59,9 +59,10 @@
  *
  * <p>
  * Hybrid objects have {@link HubType#Instance} but a {@link LayoutEncoding} like an array. This is
- * important to keep in mind because methods such as {@link Class#isArray()} will return
- * {@code false}, while methods such as {@link LayoutEncoding#isArray} will return {@code true} for
- * hybrid objects.
+ * important to keep in mind because methods such as {@link Class#isInstance} will return
+ * {@code true} and {@link Class#isArray()} will return {@code false}, while
+ * {@link LayoutEncoding#isPureInstance} will return {@code false} and
+ * {@link LayoutEncoding#isArrayLike} will return {@code true} and for hybrid objects.
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoEncoder.java

@@ -646,7 +646,7 @@ private static ValueInfo findActualArrayElement(ValueInfo[] actualObject, Unsign
     private static ValueInfo findActualField(ValueInfo[] actualObject, UnsignedWord expectedOffset) {
         DynamicHub hub = (DynamicHub) SubstrateObjectConstant.asObject(actualObject[0].getValue());
         ObjectLayout objectLayout = ConfigurationValues.getObjectLayout();
-        assert LayoutEncoding.isInstance(hub.getLayoutEncoding());
+        assert LayoutEncoding.isPureInstance(hub.getLayoutEncoding());
         return findActualValue(actualObject, expectedOffset, objectLayout, WordFactory.unsigned(objectLayout.getFirstFieldOffset()), 1);
     }
 

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/Deoptimizer.java

@@ -990,6 +990,7 @@ private Object materializeObject(int virtualObjectId, FrameInfoQueryResult sourc
             curOffset = LayoutEncoding.getArrayBaseOffset(hub.getLayoutEncoding());
             curIdx = 2;
         } else {
+            assert LayoutEncoding.isPureInstance(hub.getLayoutEncoding());
             try {
                 obj = Unsafe.getUnsafe().allocateInstance(DynamicHub.toClass(hub));
             } catch (InstantiationException ex) {

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/SubstrateObjectCloneSnippets.java

@@ -96,11 +96,11 @@ private static Object doClone(Object original) throws CloneNotSupportedException
 
         DynamicHub hub = KnownIntrinsics.readHub(original);
         int layoutEncoding = hub.getLayoutEncoding();
-        boolean hasArray = LayoutEncoding.isArray(layoutEncoding);
+        boolean isArrayLike = LayoutEncoding.isArrayLike(layoutEncoding);
 
         Object result;
-        if (hasArray) {
-            // Hybrids like pods have an array encoding, but a non-array hub type.
+        if (isArrayLike) {
+            // Hybrids like pods have an array-like encoding, but a non-array hub type.
             if (BranchProbabilityNode.probability(FAST_PATH_PROBABILITY, hub.isArray())) {
                 int length = ArrayLengthNode.arrayLength(original);
                 Object newArray = java.lang.reflect.Array.newInstance(DynamicHub.toClass(hub.getComponentHub()), length);
@@ -153,8 +153,8 @@ private static Object doClone(Object original) throws CloneNotSupportedException
         }
 
         // copy remaining non-object data
-        if (!hasArray) {
-            int objectSize = UnsignedUtils.safeToInt(LayoutEncoding.getInstanceSize(layoutEncoding));
+        if (!isArrayLike) {
+            int objectSize = UnsignedUtils.safeToInt(LayoutEncoding.getPureInstanceSize(layoutEncoding));
             int primitiveDataSize = objectSize - curOffset;
             assert primitiveDataSize >= 0;
             assert curOffset >= 0;
@@ -182,9 +182,9 @@ static boolean canVirtualize(ObjectClone node, VirtualizerTool tool) {
             return false;
         }
         if (!type.isArray() && type instanceof SharedType) {
-            // Hybrids are instances with array encoding; cloning them virtually is not implemented.
+            // Hybrids are instances with array-like encoding; cloning virtually is unimplemented.
             int encoding = ((SharedType) type).getHub().getLayoutEncoding();
-            return !LayoutEncoding.isArray(encoding);
+            return !LayoutEncoding.isArrayLike(encoding);
         }
         return true;
     }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/SubstrateAllocationSnippets.java

@@ -140,7 +140,7 @@ public Object allocateArray(@NonNullParameter DynamicHub hub,
     public Object allocateInstanceDynamic(@NonNullParameter DynamicHub hub, @ConstantParameter FillContent fillContents, @ConstantParameter boolean emitMemoryBarrier,
                     @ConstantParameter AllocationProfilingData profilingData) {
         // The hub was already verified by a ValidateNewInstanceClassNode.
-        UnsignedWord size = LayoutEncoding.getInstanceSize(hub.getLayoutEncoding());
+        UnsignedWord size = LayoutEncoding.getPureInstanceSize(hub.getLayoutEncoding());
         Object result = allocateInstanceImpl(encodeAsTLABObjectHeader(hub), size, fillContents, emitMemoryBarrier, false, profilingData);
         return piCastToSnippetReplaceeStamp(result);
     }
@@ -168,7 +168,7 @@ protected Object newmultiarray(DynamicHub hub, @ConstantParameter int rank, @Var
     private static DynamicHub validateNewInstanceClass(DynamicHub hub) {
         if (probability(EXTREMELY_FAST_PATH_PROBABILITY, hub != null)) {
             DynamicHub nonNullHub = (DynamicHub) PiNode.piCastNonNull(hub, SnippetAnchorNode.anchor());
-            if (probability(EXTREMELY_FAST_PATH_PROBABILITY, LayoutEncoding.isInstance(nonNullHub.getLayoutEncoding())) &&
+            if (probability(EXTREMELY_FAST_PATH_PROBABILITY, LayoutEncoding.isPureInstance(nonNullHub.getLayoutEncoding())) &&
                             probability(EXTREMELY_FAST_PATH_PROBABILITY, nonNullHub.isInstantiated())) {
                 return nonNullHub;
             }
@@ -212,7 +212,7 @@ private static Object newMultiArrayRecursion(DynamicHub hub, int rank, Word dime
     private static void instanceHubErrorStub(DynamicHub hub) throws InstantiationException {
         if (hub == null) {
             throw new NullPointerException("Allocation type is null.");
-        } else if (!LayoutEncoding.isInstance(hub.getLayoutEncoding())) {
+        } else if (!LayoutEncoding.isPureInstance(hub.getLayoutEncoding())) {
             throw new InstantiationException("Cannot allocate instance.");
         } else if (!hub.isInstantiated()) {
             throw new IllegalArgumentException("Type " + DynamicHub.toClass(hub).getTypeName() + " is instantiated reflectively but was never registered." +
@@ -443,7 +443,7 @@ public void lower(NewInstanceNode node, LoweringTool tool) {
                 DynamicHub hub = ensureMarkedAsInstantiated(type.getHub());
 
                 ConstantNode hubConstant = ConstantNode.forConstant(SubstrateObjectConstant.forObject(hub), providers.getMetaAccess(), graph);
-                long size = LayoutEncoding.getInstanceSize(hub.getLayoutEncoding()).rawValue();
+                long size = LayoutEncoding.getPureInstanceSize(hub.getLayoutEncoding()).rawValue();
 
                 Arguments args = new Arguments(allocateInstance, graph.getGuardsStage(), tool.getLoweringStage());
                 args.add("hub", hubConstant);

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/InteriorObjRefWalker.java

@@ -66,7 +66,7 @@ public static boolean walkObjectInline(final Object obj, final ObjectReferenceVi
         final Pointer objPointer = Word.objectToUntrackedPointer(obj);
 
         // Visit each Object reference in the array part of the Object.
-        if (LayoutEncoding.isObjectArray(layoutEncoding)) {
+        if (LayoutEncoding.isArrayLikeWithObjectElements(layoutEncoding)) {
             int length = ArrayLengthNode.arrayLength(obj);
             int referenceSize = ConfigurationValues.getObjectLayout().getReferenceSize();
             boolean isCompressed = ReferenceAccess.singleton().haveCompressedReferences();