Skip to content

Commit b9c92e7

Browse files
committed
Rename builtin type 'TruffleObject' to 'foreign'.
1 parent 743dd28 commit b9c92e7

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/PythonBuiltinClassType.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,14 @@
2929

3030
import com.oracle.graal.python.PythonLanguage;
3131
import com.oracle.graal.python.builtins.objects.type.LazyPythonClass;
32+
import com.oracle.graal.python.nodes.BuiltinNames;
3233
import com.oracle.truffle.api.CompilerAsserts;
3334
import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
3435
import com.oracle.truffle.api.object.Shape;
3536

3637
public enum PythonBuiltinClassType implements LazyPythonClass {
3738

38-
TruffleObject("truffle_object"),
39+
TruffleObject(BuiltinNames.FOREIGN),
3940
Boolean("bool", "builtins"),
4041
GetSetDescriptor("get_set_desc"),
4142
PArray("array", "array"),

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@
7272
import com.oracle.graal.python.builtins.objects.type.TypeNodesFactory.GetTypeFlagsNodeGen;
7373
import com.oracle.graal.python.builtins.objects.type.TypeNodesFactory.IsSameTypeNodeGen;
7474
import com.oracle.graal.python.builtins.objects.type.TypeNodesFactory.IsTypeNodeGen;
75-
import com.oracle.graal.python.nodes.BuiltinNames;
7675
import com.oracle.graal.python.nodes.PGuards;
7776
import com.oracle.graal.python.nodes.PNodeWithContext;
7877
import com.oracle.graal.python.nodes.SpecialMethodNames;
@@ -274,10 +273,6 @@ public static String doSlowPath(Object obj) {
274273
if (obj instanceof PythonManagedClass) {
275274
return ((PythonManagedClass) obj).getName();
276275
} else if (obj instanceof PythonBuiltinClassType) {
277-
// TODO(fa): remove this special case
278-
if (obj == PythonBuiltinClassType.TruffleObject) {
279-
return BuiltinNames.FOREIGN;
280-
}
281276
return ((PythonBuiltinClassType) obj).getName();
282277
} else if (PGuards.isNativeClass(obj)) {
283278
return (String) CExtNodes.GetTypeMemberNode.doSlowPath(obj, NativeMemberNames.TP_NAME);

0 commit comments

Comments
 (0)