Skip to content

Commit 1ce4af4

Browse files
committed
add a few TruffleBoundaries and bump our apptests
1 parent 7239612 commit 1ce4af4

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1533,6 +1533,7 @@ public Object execute(VirtualFrame frame) {
15331533
@Builtin(name = "METH_KEYWORDS", fixedNumOfArguments = 1)
15341534
@GenerateNodeFactory
15351535
public abstract static class MethKeywordsNode extends PythonUnaryBuiltinNode {
1536+
@TruffleBoundary
15361537
@Specialization
15371538
Object call(PBuiltinFunction function) {
15381539
return factory().createBuiltinFunction(function.getName(), function.getEnclosingType(), function.getArity(),
@@ -1543,6 +1544,7 @@ Object call(PBuiltinFunction function) {
15431544
@Builtin(name = "METH_VARARGS", fixedNumOfArguments = 1)
15441545
@GenerateNodeFactory
15451546
public abstract static class MethVarargsNode extends PythonUnaryBuiltinNode {
1547+
@TruffleBoundary
15461548
@Specialization
15471549
Object call(PBuiltinFunction function) {
15481550
return factory().createBuiltinFunction(function.getName(), function.getEnclosingType(), function.getArity(),
@@ -1553,6 +1555,7 @@ Object call(PBuiltinFunction function) {
15531555
@Builtin(name = "METH_NOARGS", fixedNumOfArguments = 1)
15541556
@GenerateNodeFactory
15551557
public abstract static class MethNoargsNode extends PythonUnaryBuiltinNode {
1558+
@TruffleBoundary
15561559
@Specialization
15571560
Object call(PBuiltinFunction function) {
15581561
return factory().createBuiltinFunction(function.getName(), function.getEnclosingType(), function.getArity(),
@@ -1563,6 +1566,7 @@ Object call(PBuiltinFunction function) {
15631566
@Builtin(name = "METH_O", fixedNumOfArguments = 1)
15641567
@GenerateNodeFactory
15651568
public abstract static class MethONode extends PythonUnaryBuiltinNode {
1569+
@TruffleBoundary
15661570
@Specialization
15671571
Object call(PBuiltinFunction function) {
15681572
return factory().createBuiltinFunction(function.getName(), function.getEnclosingType(), function.getArity(),
@@ -1573,6 +1577,7 @@ Object call(PBuiltinFunction function) {
15731577
@Builtin(name = "METH_FASTCALL", fixedNumOfArguments = 1)
15741578
@GenerateNodeFactory
15751579
public abstract static class MethFastcallNode extends PythonUnaryBuiltinNode {
1580+
@TruffleBoundary
15761581
@Specialization
15771582
Object call(PBuiltinFunction function) {
15781583
return factory().createBuiltinFunction(function.getName(), function.getEnclosingType(), function.getArity(),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ public void addAttributeInMROFinalAssumption(String name, Assumption assumption)
144144
attrAssumptions.add(assumption);
145145
}
146146

147+
@TruffleBoundary
147148
public void invalidateAttributeInMROFinalAssumptions(String name) {
148-
CompilerAsserts.neverPartOfCompilation();
149149
List<Assumption> assumptions = attributesInMROFinalAssumptions.getOrDefault(name, new ArrayList<>());
150150
if (!assumptions.isEmpty()) {
151151
String message = className + "." + name;

mx.graalpython/mx_graalpython.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ def is_included(path):
418418
apprepo = os.environ["GRAALPYTHON_APPTESTS_REPO_URL"]
419419
_apptest_suite = _suite.import_suite(
420420
"graalpython-apptests",
421-
version="fd76a68bbb82352fa559650192c258e6c9ad623b",
421+
version="f40fcf3af008d30a67e0dbc325a0d90f1e68f0c0",
422422
urlinfos=[mx.SuiteImportURLInfo(mx_urlrewrites.rewriteurl(apprepo), "git", mx.vc_system("git"))]
423423
)
424424
mx.run_mx(["-p", _apptest_suite.dir, "graalpython-apptests"])

0 commit comments

Comments
 (0)