Fix super exception

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/superobject/SuperBuiltins.java

@@ -270,7 +270,7 @@ private PNone initFromLocalFrame(VirtualFrame frame, SuperObject self, PBytecode
                 throw raise(RuntimeError, ErrorMessages.SUPER_EMPTY_CLASS);
             }
             Object obj = rootNode.readSelf(localFrame);
-            if (obj == PNone.NONE || obj == PNone.NO_VALUE) {
+            if (obj == null) {
                 throw raise(RuntimeError, ErrorMessages.NO_ARGS, "super()");
             }
             return init(frame, self, cls, obj);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/MaterializeFrameNode.java

@@ -212,7 +212,7 @@ public abstract static class SyncFrameValuesNode extends Node {
 
         public abstract void execute(PFrame pyFrame, Frame frameToSync);
 
-        @Specialization(guards = {"hasLocals(pyFrame)", "frameToSync.getFrameDescriptor() == cachedFd",
+        @Specialization(guards = {"!pyFrame.hasCustomLocals()", "frameToSync.getFrameDescriptor() == cachedFd",
                         "variableSlotCount(cachedFd) < 32"}, limit = "1")
         @ExplodeLoop
         static void doSyncExploded(PFrame pyFrame, Frame frameToSync,
@@ -225,7 +225,7 @@ static void doSyncExploded(PFrame pyFrame, Frame frameToSync,
             }
         }
 
-        @Specialization(guards = "hasLocals(pyFrame)", replaces = "doSyncExploded")
+        @Specialization(guards = "!pyFrame.hasCustomLocals()", replaces = "doSyncExploded")
         static void doSyncLoop(PFrame pyFrame, Frame frameToSync) {
             MaterializedFrame target = pyFrame.getLocals();
             int slotCount = variableSlotCount(frameToSync.getFrameDescriptor());
@@ -234,16 +234,12 @@ static void doSyncLoop(PFrame pyFrame, Frame frameToSync) {
             }
         }
 
-        @Specialization(guards = "!hasLocals(pyFrame)")
+        @Specialization(guards = "pyFrame.hasCustomLocals()")
         @SuppressWarnings("unused")
         static void doCustomLocals(PFrame pyFrame, Frame frameToSync) {
             // nothing to do
         }
 
-        protected static boolean hasLocals(PFrame pyFrame) {
-            return pyFrame.getLocals() != null;
-        }
-
         protected static int variableSlotCount(FrameDescriptor fd) {
             FrameInfo info = (FrameInfo) fd.getInfo();
             if (info == null) {