[GR-53462] EnsureCapacityNode is now void

PullRequest: graalpython/3286

Author: horakivo

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/array/ArrayNodes.java

@@ -48,7 +48,6 @@
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.runtime.sequence.storage.ByteSequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.NativeByteSequenceStorage;
-import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
 import com.oracle.graal.python.util.OverflowException;
 import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.truffle.api.CompilerDirectives;
@@ -59,7 +58,6 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.Node;
-import com.oracle.truffle.api.profiles.InlinedBranchProfile;
 
 public abstract class ArrayNodes {
     @GenerateInline
@@ -108,15 +106,10 @@ public abstract static class EnsureCapacityNode extends Node {
 
         @Specialization
         static void ensure(Node inliningTarget, PArray array, int newCapacity,
-                        @Cached SequenceStorageNodes.EnsureCapacityNode ensureCapacityNode,
-                        @Cached InlinedBranchProfile updateProfile) {
+                        @Cached SequenceStorageNodes.EnsureCapacityNode ensureCapacityNode) {
             try {
                 int internalCapacity = PythonUtils.multiplyExact(newCapacity, array.getItemSize());
-                SequenceStorage newStorage = ensureCapacityNode.execute(inliningTarget, array.getSequenceStorage(), internalCapacity);
-                if (array.getSequenceStorage() != newStorage) {
-                    updateProfile.enter(inliningTarget);
-                    array.setSequenceStorage(newStorage);
-                }
+                ensureCapacityNode.execute(inliningTarget, array.getSequenceStorage(), internalCapacity);
             } catch (OverflowException e) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
                 PRaiseNode.raiseUncached(inliningTarget, PythonBuiltinClassType.MemoryError);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/SequenceStorageNodes.java

@@ -2074,18 +2074,17 @@ SequenceStorage doWithStorage(SequenceStorage left, PSequence seq, int len,
             } else {
                 lenResult = lengthResult(lenLeft, right.length());
             }
-            SequenceStorage dest = null;
             while (true) {
                 // unbounded loop should not be a problem for PE because generalizeStore() in the
                 // catch block immediately de-opts in the first iteration, i.e. if the storages are
                 // compatible and SequenceStoreException does not happen, then this compiles as if
                 // the while loop was not here at all
                 try {
                     // EnsureCapacityNode handles the overflow and raises an error
-                    dest = ensureCapacityNode.execute(inliningTarget, left, lenResult);
-                    return concatStoragesNode.execute(dest, left, right);
+                    ensureCapacityNode.execute(inliningTarget, left, lenResult);
+                    return concatStoragesNode.execute(left, left, right);
                 } catch (SequenceStoreException e) {
-                    left = generalizeStore(dest, e.getIndicationValue());
+                    left = generalizeStore(left, e.getIndicationValue());
                 }
             }
         }
@@ -2777,40 +2776,39 @@ static ObjectSequenceStorage doObject(@SuppressWarnings("unused") StorageType ty
     @GenerateCached(false)
     public abstract static class EnsureCapacityNode extends SequenceStorageBaseNode {
 
-        public abstract SequenceStorage execute(Node inliningTarget, SequenceStorage s, int cap);
+        public abstract void execute(Node inliningTarget, SequenceStorage s, int cap);
 
         @Specialization
-        static EmptySequenceStorage doEmpty(EmptySequenceStorage s, @SuppressWarnings("unused") int cap) {
-            return s;
+        static void doEmpty(EmptySequenceStorage s, @SuppressWarnings("unused") int cap) {
+            // do nothing
         }
 
         @Specialization(limit = "MAX_BASIC_STORAGES", guards = "s.getClass() == cachedClass")
-        static BasicSequenceStorage doManaged(Node inliningTarget, BasicSequenceStorage s, int cap,
+        static void doManaged(Node inliningTarget, BasicSequenceStorage s, int cap,
                         @Cached PRaiseNode.Lazy raiseNode,
                         @Cached("s.getClass()") Class<? extends BasicSequenceStorage> cachedClass) {
             try {
                 BasicSequenceStorage profiled = cachedClass.cast(s);
                 profiled.ensureCapacity(cap);
-                return profiled;
             } catch (OutOfMemoryError | ArithmeticException e) {
                 throw raiseNode.get(inliningTarget).raise(MemoryError);
             }
         }
 
         @Specialization
         @InliningCutoff
-        static NativeSequenceStorage doNative(NativeSequenceStorage s, int cap,
+        static void doNative(NativeSequenceStorage s, int cap,
                         @Cached(inline = false) EnsureCapacityNativeNode helper) {
-            return helper.execute(s, cap);
+            helper.execute(s, cap);
         }
 
         @GenerateInline(false)
         @GenerateUncached
         abstract static class EnsureCapacityNativeNode extends Node {
-            abstract NativeSequenceStorage execute(NativeSequenceStorage s, int cap);
+            abstract void execute(NativeSequenceStorage s, int cap);
 
             @Specialization
-            static NativeByteSequenceStorage doNativeByte(NativeByteSequenceStorage s, int cap,
+            static void doNativeByte(NativeByteSequenceStorage s, int cap,
                             @Bind("this") Node inliningTarget,
                             @Shared @CachedLibrary(limit = "2") InteropLibrary lib,
                             @Shared @Cached CStructAccess.AllocateNode alloc,
@@ -2834,11 +2832,10 @@ static NativeByteSequenceStorage doNativeByte(NativeByteSequenceStorage s, int c
                     s.setPtr(newMem);
                     s.setCapacity(newCapacity);
                 }
-                return s;
             }
 
             @Specialization
-            static NativeObjectSequenceStorage doNativeObject(NativeObjectSequenceStorage s, int cap,
+            static void doNativeObject(NativeObjectSequenceStorage s, int cap,
                             @Bind("this") Node inliningTarget,
                             @Shared @CachedLibrary(limit = "2") InteropLibrary lib,
                             @Shared @Cached CStructAccess.AllocateNode alloc,
@@ -2863,7 +2860,6 @@ static NativeObjectSequenceStorage doNativeObject(NativeObjectSequenceStorage s,
                     s.setPtr(newMem);
                     s.setCapacity(newCapacity);
                 }
-                return s;
             }
 
             private static int computeNewCapacity(int cap) {