Skip to content

Commit 12d1f0b

Browse files
committed
- intrinsified PyTruffle_Debug
- removed obsolete PyTruffle_GetBuiltin and check_argtype
1 parent 720b1ea commit 12d1f0b

File tree

3 files changed

+21
-13
lines changed

3 files changed

+21
-13
lines changed

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
import com.oracle.graal.python.builtins.Python3Core;
6565
import com.oracle.graal.python.builtins.PythonBuiltinClassType;
6666
import com.oracle.graal.python.builtins.PythonBuiltins;
67+
import com.oracle.graal.python.builtins.modules.GraalPythonModuleBuiltinsFactory.DebugNodeFactory;
6768
import com.oracle.graal.python.builtins.objects.PNone;
6869
import com.oracle.graal.python.builtins.objects.bytes.PBytes;
6970
import com.oracle.graal.python.builtins.objects.code.CodeNodes;
@@ -545,6 +546,9 @@ String doIt() {
545546
@Builtin(name = "tdebug", takesVarArgs = true)
546547
@GenerateNodeFactory
547548
public abstract static class DebugNode extends PythonBuiltinNode {
549+
550+
public abstract Object execute(Object[] args);
551+
548552
@Specialization
549553
@TruffleBoundary
550554
public Object doIt(Object[] args) {
@@ -555,6 +559,10 @@ public Object doIt(Object[] args) {
555559
stdout.flush();
556560
return PNone.NONE;
557561
}
562+
563+
public static DebugNode create() {
564+
return DebugNodeFactory.create(null);
565+
}
558566
}
559567

560568
@Builtin(name = "builtin", minNumOfPositionalArgs = 1)

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextBuiltins.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676
import com.oracle.graal.python.builtins.Python3Core;
7777
import com.oracle.graal.python.builtins.PythonBuiltinClassType;
7878
import com.oracle.graal.python.builtins.PythonBuiltins;
79+
import com.oracle.graal.python.builtins.modules.GraalPythonModuleBuiltins.DebugNode;
7980
import com.oracle.graal.python.builtins.modules.SysModuleBuiltins;
8081
import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltinsFactory.CreateFunctionNodeGen;
8182
import com.oracle.graal.python.builtins.objects.PNone;
@@ -3076,4 +3077,16 @@ Object methodNew(Object func, Object self) {
30763077
return factory().createMethod(self, func);
30773078
}
30783079
}
3080+
3081+
@Builtin(name = "PyTruffle_Debug", takesVarArgs = true)
3082+
@GenerateNodeFactory
3083+
public abstract static class PyTruffleDebugNode extends PythonBuiltinNode {
3084+
@Specialization
3085+
@TruffleBoundary
3086+
public Object doIt(Object[] args,
3087+
@Cached DebugNode debugNode) {
3088+
debugNode.execute(args);
3089+
return PNone.NONE;
3090+
}
3091+
}
30793092
}

graalpython/lib-graalpython/python_cext.py

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -55,19 +55,6 @@ def decorator(fun):
5555

5656
##################### C EXT HELPERS
5757

58-
def PyTruffle_Debug(*args):
59-
__graalpython__.tdebug(*args)
60-
61-
62-
def PyTruffle_GetBuiltin(name):
63-
return getattr(sys.modules["builtins"], name)
64-
65-
66-
def check_argtype(idx, obj, typ):
67-
if not isinstance(obj, typ):
68-
raise TypeError("argument %d must be '%s', not '%s'" % (idx, str(typ), str(type(obj)).__name__))
69-
70-
7158
def initialize_datetime_capi(capi_library):
7259
import datetime
7360

0 commit comments

Comments
 (0)