Skip to content

Commit ca0815a

Browse files
committed
removed not used Py_ErrorHandler
1 parent e51bf26 commit ca0815a

File tree

2 files changed

+0
-20
lines changed
  • graalpython

2 files changed

+0
-20
lines changed

graalpython/com.oracle.graal.python.cext/src/capi.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -308,10 +308,6 @@ static void initialize_globals() {
308308
void *jfalse = UPCALL_CEXT_O(polyglot_from_string("Py_False", SRC_CS));
309309
truffle_assign_managed(&_Py_FalseStruct, jfalse);
310310

311-
// error marker
312-
void *jerrormarker = UPCALL_CEXT_PTR(polyglot_from_string("Py_ErrorHandler", SRC_CS));
313-
truffle_assign_managed(&marker_struct, jerrormarker);
314-
315311
// long zero, long one
316312
_PyLong_Zero = (PyObject *)&_Py_FalseStruct;
317313
_PyLong_One = (PyObject *)&_Py_TrueStruct;

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,6 @@
193193
import com.oracle.graal.python.builtins.objects.tuple.StructSequence.Descriptor;
194194
import com.oracle.graal.python.builtins.objects.type.PythonAbstractClass;
195195
import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
196-
import com.oracle.graal.python.builtins.objects.type.PythonClass;
197196
import com.oracle.graal.python.builtins.objects.type.PythonManagedClass;
198197
import com.oracle.graal.python.builtins.objects.type.SpecialMethodSlot;
199198
import com.oracle.graal.python.builtins.objects.type.TypeNodes;
@@ -295,7 +294,6 @@ public final class PythonCextBuiltins extends PythonBuiltins {
295294

296295
public static final String PYTHON_CEXT = "python_cext";
297296

298-
private static final String ERROR_HANDLER = "error_handler";
299297
public static final String NATIVE_NULL = "native_null";
300298

301299
private PythonObject errorHandler;
@@ -308,11 +306,6 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
308306
@Override
309307
public void initialize(Python3Core core) {
310308
super.initialize(core);
311-
PythonClass errorHandlerClass = core.factory().createPythonClassAndFixupSlots(core.getLanguage(), PythonBuiltinClassType.PythonClass,
312-
"CErrorHandler", new PythonAbstractClass[]{core.lookupType(PythonBuiltinClassType.PythonObject)});
313-
builtinConstants.put("CErrorHandler", errorHandlerClass);
314-
errorHandler = core.factory().createPythonObject(errorHandlerClass);
315-
builtinConstants.put(ERROR_HANDLER, errorHandler);
316309
// TODO can be removed when python_cext.py is gone
317310
builtinConstants.put(NATIVE_NULL, core.getContext().getNativeNull());
318311
builtinConstants.put("PyEval_SaveThread", new PyEvalSaveThread());
@@ -378,15 +371,6 @@ Object run(VirtualFrame frame, Object o) {
378371
}
379372
}
380373

381-
@Builtin(name = "Py_ErrorHandler", minNumOfPositionalArgs = 1, declaresExplicitSelf = true)
382-
@GenerateNodeFactory
383-
public abstract static class PyErrorHandlerNode extends PythonUnaryBuiltinNode {
384-
@Specialization
385-
static Object run(PythonModule cextPython) {
386-
return ((PythonCextBuiltins) cextPython.getBuiltins()).errorHandler;
387-
}
388-
}
389-
390374
@Builtin(name = "Py_NotImplemented")
391375
@GenerateNodeFactory
392376
public abstract static class PyNotImplementedNode extends PythonBuiltinNode {

0 commit comments

Comments
 (0)