index normalization may be called without a frame

Author: timfel

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

@@ -463,6 +463,7 @@ abstract static class NormalizingNode extends PNodeWithContext {
         @Child private NormalizeIndexNode normalizeIndexNode;
         @Child private PythonObjectLibrary lib;
         @CompilationFinal private ValueProfile storeProfile;
+        @CompilationFinal private ConditionProfile gotFrameProfile;
 
         protected NormalizingNode(NormalizeIndexNode normalizeIndexNode) {
             this.normalizeIndexNode = normalizeIndexNode;
@@ -477,7 +478,16 @@ private PythonObjectLibrary getLibrary() {
         }
 
         protected final int normalizeIndex(VirtualFrame frame, Object idx, SequenceStorage store) {
-            int intIdx = getLibrary().asSizeWithState(idx, PythonBuiltinClassType.IndexError, PArguments.getThreadState(frame));
+            if (gotFrameProfile == null) {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                gotFrameProfile = ConditionProfile.createBinaryProfile();
+            }
+            int intIdx;
+            if (gotFrameProfile.profile(frame != null)) {
+                intIdx = getLibrary().asSizeWithState(idx, PythonBuiltinClassType.IndexError, PArguments.getThreadState(frame));
+            } else {
+                intIdx = getLibrary().asSize(idx, PythonBuiltinClassType.IndexError);
+            }
             if (normalizeIndexNode != null) {
                 return normalizeIndexNode.execute(intIdx, getStoreProfile().profile(store).length());
             }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/function/PArguments.java

@@ -352,7 +352,7 @@ public static PDict getGeneratorFrameLocals(Object[] arguments) {
     }
 
     public static ThreadState getThreadState(VirtualFrame frame) {
-        assert frame != null;
+        assert frame != null : "cannot get thread state without a frame";
         return new ThreadState(PArguments.getCurrentFrameInfo(frame), PArguments.getException(frame));
     }