Skip to content

Commit 87ecf42

Browse files
committed
remove implicit casts to String->TruffleString
1 parent ed8adac commit 87ecf42

File tree

5 files changed

+0
-21
lines changed

5 files changed

+0
-21
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/StringNodes.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@
7171
import com.oracle.graal.python.nodes.control.GetNextNode;
7272
import com.oracle.graal.python.nodes.object.GetClassNode;
7373
import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
74-
import com.oracle.graal.python.nodes.truffle.TruffleStringMigrationPythonTypes;
7574
import com.oracle.graal.python.nodes.util.CannotCastException;
7675
import com.oracle.graal.python.nodes.util.CastToJavaIntExactNode;
7776
import com.oracle.graal.python.nodes.util.CastToJavaStringNode;
@@ -91,7 +90,6 @@
9190
import com.oracle.truffle.api.dsl.GenerateUncached;
9291
import com.oracle.truffle.api.dsl.ImportStatic;
9392
import com.oracle.truffle.api.dsl.Specialization;
94-
import com.oracle.truffle.api.dsl.TypeSystemReference;
9593
import com.oracle.truffle.api.frame.VirtualFrame;
9694
import com.oracle.truffle.api.interop.InteropLibrary;
9795
import com.oracle.truffle.api.library.CachedLibrary;
@@ -493,7 +491,6 @@ private static PException raiseError(PRaiseNode raise) {
493491

494492
@ImportStatic(PGuards.class)
495493
@GenerateUncached
496-
@TypeSystemReference(TruffleStringMigrationPythonTypes.class)
497494
public abstract static class InternStringNode extends Node {
498495
public abstract PString execute(Object string);
499496

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,15 @@
4242

4343
import com.oracle.graal.python.PythonLanguage;
4444
import com.oracle.graal.python.builtins.objects.type.SpecialMethodSlot;
45-
import com.oracle.graal.python.nodes.truffle.TruffleStringMigrationPythonTypes;
4645
import com.oracle.graal.python.runtime.PythonContext;
4746
import com.oracle.graal.python.runtime.PythonOptions;
4847
import com.oracle.graal.python.runtime.exception.ExceptionUtils;
4948
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
5049
import com.oracle.truffle.api.dsl.ImportStatic;
51-
import com.oracle.truffle.api.dsl.TypeSystemReference;
5250
import com.oracle.truffle.api.nodes.Node;
5351
import com.oracle.truffle.api.profiles.ValueProfile;
5452

5553
@ImportStatic({PGuards.class, PythonOptions.class, SpecialMethodNames.class, SpecialAttributeNames.class, SpecialMethodSlot.class, BuiltinNames.class})
56-
@TypeSystemReference(TruffleStringMigrationPythonTypes.class)
5754
public abstract class PNodeWithContext extends Node {
5855

5956
/**

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/builtins/clinic/ArgumentCastNode.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
import com.oracle.graal.python.nodes.PRaiseNode;
5050
import com.oracle.graal.python.nodes.SpecialAttributeNames;
5151
import com.oracle.graal.python.nodes.SpecialMethodNames;
52-
import com.oracle.graal.python.nodes.truffle.TruffleStringMigrationPythonTypes;
5352
import com.oracle.graal.python.runtime.PythonContext;
5453
import com.oracle.graal.python.runtime.PythonOptions;
5554
import com.oracle.graal.python.runtime.exception.PException;
@@ -58,13 +57,11 @@
5857
import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
5958
import com.oracle.truffle.api.Truffle;
6059
import com.oracle.truffle.api.dsl.ImportStatic;
61-
import com.oracle.truffle.api.dsl.TypeSystemReference;
6260
import com.oracle.truffle.api.frame.VirtualFrame;
6361
import com.oracle.truffle.api.nodes.Node;
6462
import com.oracle.truffle.api.strings.TruffleString;
6563

6664
@ImportStatic({PGuards.class, PythonOptions.class, SpecialMethodNames.class, SpecialAttributeNames.class, BuiltinNames.class})
67-
@TypeSystemReference(TruffleStringMigrationPythonTypes.class)
6865
public abstract class ArgumentCastNode extends Node {
6966
public abstract Object execute(VirtualFrame frame, Object value);
7067

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/truffle/PythonArithmeticTypes.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,6 @@
4848
@TypeSystem
4949
public abstract class PythonArithmeticTypes {
5050

51-
// see comment in TruffleStringMigrationPythonTypes
52-
@ImplicitCast
53-
public static TruffleString fromJavaString(String value) {
54-
return TruffleStringMigrationPythonTypes.fromJavaString(value);
55-
}
56-
5751
@ImplicitCast
5852
public static double PFloatToDouble(PFloat value) {
5953
// NOTE: That's correct because we just use it in arithmetic operations where CPython also

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/truffle/PythonTypes.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,6 @@
3737
@TypeSystem
3838
public abstract class PythonTypes {
3939

40-
// see comment in TruffleStringMigrationPythonTypes
41-
@ImplicitCast
42-
public static TruffleString fromJavaString(String value) {
43-
return TruffleStringMigrationPythonTypes.fromJavaString(value);
44-
}
45-
4640
@ImplicitCast
4741
public static long intToLong(int value) {
4842
return value;

0 commit comments

Comments
 (0)