Skip to content

Commit 7bc1453

Browse files
committed
Fix: don't use 'toString' for assumption name.
1 parent 926844e commit 7bc1453

File tree

1 file changed

+11
-7
lines changed
  • graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/function

1 file changed

+11
-7
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/function/PFunction.java

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ public class PFunction extends PythonObject {
5050
private static final Object[] EMPTY_DEFAULTS = new Object[0];
5151
private final String name;
5252
private final String enclosingClassName;
53-
private final Assumption codeStableAssumption = Truffle.getRuntime().createAssumption("function code unchanged for " + toString());
54-
private final Assumption defaultsStableAssumption = Truffle.getRuntime().createAssumption("function defaults unchanged " + toString());
53+
private final Assumption codeStableAssumption = Truffle.getRuntime().createAssumption("function code unchanged for " + getQualifiedName());
54+
private final Assumption defaultsStableAssumption = Truffle.getRuntime().createAssumption("function defaults unchanged " + getQualifiedName());
5555
private final PythonObject globals;
5656
private final PCell[] closure;
5757
private final boolean isStatic;
@@ -114,6 +114,14 @@ public String getName() {
114114
return name;
115115
}
116116

117+
public String getQualifiedName() {
118+
if (enclosingClassName == null) {
119+
return name;
120+
} else {
121+
return enclosingClassName + "." + name;
122+
}
123+
}
124+
117125
public Arity getArity() {
118126
return getCode().getArity();
119127
}
@@ -133,11 +141,7 @@ public PGeneratorFunction asGeneratorFunction() {
133141
@Override
134142
public final String toString() {
135143
CompilerAsserts.neverPartOfCompilation();
136-
if (enclosingClassName == null) {
137-
return String.format("PFunction %s at 0x%x", name, hashCode());
138-
} else {
139-
return String.format("PFunction %s.%s at 0x%x", enclosingClassName, name, hashCode());
140-
}
144+
return String.format("PFunction %s at 0x%x", getQualifiedName(), hashCode());
141145
}
142146

143147
public PCode getCode() {

0 commit comments

Comments
 (0)