Rebase fixes

Author: msimacek

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

@@ -2612,10 +2612,9 @@ Object isqrtPInt(PInt x,
 
         @Specialization(guards = "!isInteger(x)")
         Object doGeneral(VirtualFrame frame, Object x,
-                        @Cached("createBinaryProfile()") ConditionProfile hasFrame,
                         @CachedLibrary(limit = "1") PythonObjectLibrary lib,
                         @Cached IsqrtNode recursiveNode) {
-            return recursiveNode.execute(frame, lib.asIndexWithFrame(x, hasFrame, frame));
+            return recursiveNode.execute(frame, lib.asIndexWithFrame(x, frame));
         }
 
         @TruffleBoundary

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/exception/BaseExceptionBuiltins.java

@@ -319,10 +319,11 @@ public abstract static class ReduceNode extends PythonUnaryBuiltinNode {
         @Specialization(limit = "1")
         Object reduce(VirtualFrame frame, PBaseException self,
                         @CachedLibrary("self") PythonObjectLibrary lib,
-                        @Cached ArgsNode argsNode) {
+                        @Cached ArgsNode argsNode,
+                        @Cached DictNode dictNode) {
             Object clazz = lib.getLazyPythonClass(self);
             Object args = argsNode.executeObject(frame, self, PNone.NO_VALUE);
-            Object dict = lib.lookupAttributeOnTypeStrict(self, __DICT__);
+            Object dict = dictNode.execute(frame, self, PNone.NO_VALUE);
             return factory().createTuple(new Object[]{clazz, args, dict});
         }
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/method/MethodBuiltins.java

@@ -143,9 +143,9 @@ Object reprMethod(VirtualFrame frame, PMethod method,
             Object func = method.getFunction();
             String defname = "?";
 
-            Object funcName = pol.lookupAttribute(func, __QUALNAME__);
+            Object funcName = pol.lookupAttribute(func, frame, __QUALNAME__);
             if (funcName == PNone.NO_VALUE) {
-                funcName = pol.lookupAttribute(func, __NAME__);
+                funcName = pol.lookupAttribute(func, frame, __NAME__);
             }
 
             try {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/method/PBuiltinMethod.java

@@ -69,6 +69,7 @@ public boolean isCallable() {
     }
 
     @ExportMessage
+    @SuppressWarnings("static-method")
     boolean isHashable() {
         return true;
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/method/PMethod.java

@@ -81,6 +81,7 @@ protected boolean hasSourceLocation(@CachedLibrary("this.function") InteropLibra
     }
 
     @ExportMessage
+    @SuppressWarnings("static-method")
     boolean isHashable() {
         return true;
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/module/ModuleBuiltins.java

@@ -142,15 +142,15 @@ public PNone module(PythonModule self, String name, Object doc,
     @GenerateNodeFactory
     public abstract static class ModuleDirNode extends PythonUnaryBuiltinNode {
         @Specialization
-        Object dir(PythonModule self,
+        Object dir(VirtualFrame frame, PythonModule self,
                         @Cached CastToJavaStringNode castToJavaStringNode,
                         @Cached IsBuiltinClassProfile isDictProfile,
                         @Cached HashingCollectionNodes.GetDictStorageNode getDictStorageNode,
                         @Cached ListNodes.ConstructListNode constructListNode,
                         @Cached CallNode callNode,
                         @CachedLibrary(limit = "1") HashingStorageLibrary hashLib,
                         @CachedLibrary(limit = "1") PythonObjectLibrary pol) {
-            Object dict = pol.lookupAttribute(self, __DICT__);
+            Object dict = pol.lookupAttribute(self, frame, __DICT__);
             if (isDict(dict, isDictProfile)) {
                 HashingStorage dictStorage = getDictStorageNode.execute((PHashingCollection) dict);
                 Object dirFunc = hashLib.getItem(dictStorage, __DIR__);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/TypeNodes.java

@@ -754,7 +754,7 @@ private boolean compatibleWithBase(VirtualFrame frame, Object child, Object pare
             }
 
             // instead of child->tp_dictoffset == parent->tp_dictoffset
-            if (hasDict(child) != hasDict(parent)) {
+            if (hasDict(frame, child) != hasDict(frame, parent)) {
                 return false;
             }
 
@@ -828,16 +828,16 @@ private String getTypeName(Object clazz) {
         }
 
         private Object getSlotsFromDict(VirtualFrame frame, Object type) {
-            Object dict = getDictNode().executeObject(frame, type, __DICT__);
+            Object dict = getObjectLibrary().lookupAttribute(type, frame, __DICT__);
             if (dict != PNone.NO_VALUE) {
                 HashingStorage storage = getDictStorageNode().execute((PHashingCollection) dict);
                 return getHashingStorageLibrary().getItem(storage, __SLOTS__);
             }
             return null;
         }
 
-        private boolean hasDict(Object obj) {
-            return getObjectLibrary().lookupAttributeOnType(obj, __DICT__) != PNone.NO_VALUE;
+        private boolean hasDict(VirtualFrame frame, Object type) {
+            return getObjectLibrary().lookupAttribute(type, frame, __DICT__) != PNone.NO_VALUE;
         }
 
         private GetObjectArrayNode getObjectArrayNode() {
@@ -856,14 +856,6 @@ private PythonObjectLibrary getObjectLibrary() {
             return objectLibrary;
         }
 
-        private LookupAndCallBinaryNode getDictNode() {
-            if (getDictNode == null) {
-                CompilerDirectives.transferToInterpreterAndInvalidate();
-                getDictNode = insert(LookupAndCallBinaryNode.create(__GETATTRIBUTE__));
-            }
-            return getDictNode;
-        }
-
         private GetDictStorageNode getDictStorageNode() {
             if (getDictStorageNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();