Remove erroneous @ExplodeLoop in BuiltinConstructors and ArrayBuiltins

Author: steve-s

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinConstructors.java

@@ -136,9 +136,9 @@
 import com.oracle.graal.python.builtins.objects.common.HashingStorageLibrary;
 import com.oracle.graal.python.builtins.objects.common.SequenceNodes;
 import com.oracle.graal.python.builtins.objects.common.SequenceNodes.GetObjectArrayNode;
-import com.oracle.graal.python.builtins.objects.common.SequenceNodesFactory.GetObjectArrayNodeGen;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes.NoGeneralizationNode;
+import com.oracle.graal.python.builtins.objects.common.SequenceNodesFactory.GetObjectArrayNodeGen;
 import com.oracle.graal.python.builtins.objects.complex.PComplex;
 import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.builtins.objects.ellipsis.PEllipsis;
@@ -267,7 +267,6 @@
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.library.CachedLibrary;
-import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.nodes.UnexpectedResultException;
 import com.oracle.truffle.api.object.HiddenKey;
 import com.oracle.truffle.api.profiles.BranchProfile;
@@ -2186,7 +2185,6 @@ public PFunction function(Object cls, PCode code, PDict globals, String name, PT
             return factory().createFunction(name, getTypeName(cls), code, globals, getObjectArrayNode.execute(defaultArgs), null, getClosure(getObjectArrayNode.execute(closure)));
         }
 
-        @ExplodeLoop
         private static PCell[] getClosure(Object[] closure) {
             assert closure != null;
             PCell[] cells = new PCell[closure.length];

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

@@ -1180,14 +1180,18 @@ static Object byteswap8(PArray self) {
             return PNone.NONE;
         }
 
-        @ExplodeLoop
         private static void doByteSwapExploded(PArray self, int itemsize, byte[] buffer) {
             for (int i = 0; i < self.getLength() * itemsize; i += itemsize) {
-                for (int j = 0; j < itemsize / 2; j++) {
-                    byte b = buffer[i + j];
-                    buffer[i + j] = buffer[i + itemsize - j - 1];
-                    buffer[i + itemsize - j - 1] = b;
-                }
+                doByteSwapExplodedInnerLoop(buffer, itemsize, i);
+            }
+        }
+
+        @ExplodeLoop
+        private static void doByteSwapExplodedInnerLoop(byte[] buffer, int itemsize, int i) {
+            for (int j = 0; j < itemsize / 2; j++) {
+                byte b = buffer[i + j];
+                buffer[i + j] = buffer[i + itemsize - j - 1];
+                buffer[i + itemsize - j - 1] = b;
             }
         }
     }