Skip to content

Commit 0ba9406

Browse files
committed
Rename PNodeWithContext.isUncached() to isUncachedNode() to avoid conflicts with future Truffle APIs.
1 parent e29d806 commit 0ba9406

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/PNodeWithContext.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* The Universal Permissive License (UPL), Version 1.0
@@ -60,7 +60,8 @@ public abstract class PNodeWithContext extends Node {
6060
* @return {@code true} if this node can be shared statically.
6161
*/
6262
@Idempotent
63-
protected final boolean isUncached() {
63+
// conflicting with Node.isUncached(). Should be migrated to Node.isUncached() in the future.
64+
protected final boolean isUncachedNode() {
6465
return !isAdoptable();
6566
}
6667

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/classes/AbstractObjectGetBasesNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public final PTuple execute(VirtualFrame frame, Object cls) {
7777
return executeInternal(frame, cls);
7878
}
7979

80-
@Specialization(guards = "!isUncached()")
80+
@Specialization(guards = "!isUncachedNode()")
8181
static PTuple getBasesCached(VirtualFrame frame, Object cls,
8282
@Bind("this") Node inliningTarget,
8383
@Cached PyObjectGetAttr getAttributeNode,

0 commit comments

Comments
 (0)