Skip to content

Commit 2c3a904

Browse files
committed
use solid base in mroCheck()
1 parent a52d046 commit 2c3a904

File tree

3 files changed

+169
-136
lines changed

3 files changed

+169
-136
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -585,12 +585,12 @@ Object setBases(VirtualFrame frame, PythonClass cls, PTuple value,
585585
}
586586
}
587587

588-
PythonAbstractClass newBestBase = getBestBase.execute(frame, baseClasses);
588+
LazyPythonClass newBestBase = getBestBase.execute(baseClasses);
589589
if (newBestBase == null) {
590590
return null;
591591
}
592592

593-
PythonAbstractClass oldBase = getBase.execute(frame, cls);
593+
LazyPythonClass oldBase = getBase.execute(cls);
594594
checkCompatibleForAssigment.execute(frame, oldBase, newBestBase);
595595

596596
cls.setSuperClass(baseClasses);
@@ -616,9 +616,9 @@ Object setBuiltin(@SuppressWarnings("unused") PythonBuiltinClass cls, @SuppressW
616616
@GenerateNodeFactory
617617
abstract static class BaseNode extends PythonBuiltinNode {
618618
@Specialization
619-
static Object base(VirtualFrame frame, Object self,
619+
static Object base(Object self,
620620
@Cached TypeNodes.GetBaseClassNode getBaseClassNode) {
621-
Object baseClass = getBaseClassNode.execute(frame, self);
621+
Object baseClass = getBaseClassNode.execute(self);
622622
return baseClass != null ? baseClass : PNone.NONE;
623623
}
624624
}

0 commit comments

Comments
 (0)