Skip to content

Commit f4287bb

Browse files
committed
merged Py_XXXREFNode-s into one
1 parent c10daa8 commit f4287bb

File tree

1 file changed

+2
-34
lines changed

1 file changed

+2
-34
lines changed

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

Lines changed: 2 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,7 @@
223223
import com.oracle.graal.python.builtins.objects.getsetdescriptor.GetSetDescriptor;
224224
import com.oracle.graal.python.builtins.objects.ints.PInt;
225225
import com.oracle.graal.python.builtins.objects.iterator.PSequenceIterator;
226+
import com.oracle.graal.python.builtins.objects.list.ListBuiltins;
226227
import com.oracle.graal.python.builtins.objects.list.ListBuiltins.ListExtendNode;
227228
import com.oracle.graal.python.builtins.objects.list.ListBuiltins.ListInsertNode;
228229
import com.oracle.graal.python.builtins.objects.list.ListBuiltins.ListSortNode;
@@ -242,12 +243,9 @@
242243
import com.oracle.graal.python.builtins.objects.set.SetNodes.DiscardNode;
243244
import com.oracle.graal.python.builtins.objects.str.NativeCharSequence;
244245
import com.oracle.graal.python.builtins.objects.str.PString;
245-
<<<<<<< HEAD
246246
import com.oracle.graal.python.builtins.objects.str.StringBuiltins;
247-
=======
248247
import com.oracle.graal.python.builtins.objects.str.StringBuiltins.EncodeNode;
249248
import com.oracle.graal.python.builtins.objects.str.StringBuiltins.ModNode;
250-
>>>>>>> intrinsified python_cext PyBytes_XXX
251249
import com.oracle.graal.python.builtins.objects.traceback.GetTracebackNode;
252250
import com.oracle.graal.python.builtins.objects.traceback.LazyTraceback;
253251
import com.oracle.graal.python.builtins.objects.traceback.PTraceback;
@@ -1309,30 +1307,10 @@ public Object values(VirtualFrame frame, Object obj,
13091307
}
13101308

13111309
@Builtin(name = "Py_DECREF", minNumOfPositionalArgs = 1)
1312-
@GenerateNodeFactory
1313-
public abstract static class PyDECREFNode extends PythonUnaryBuiltinNode {
1314-
@SuppressWarnings("unused")
1315-
@Specialization
1316-
public Object values(Object obj) {
1317-
// pass
1318-
return PNone.NONE;
1319-
}
1320-
}
1321-
13221310
@Builtin(name = "Py_INCREF", minNumOfPositionalArgs = 1)
1323-
@GenerateNodeFactory
1324-
public abstract static class PyINCREFNode extends PythonUnaryBuiltinNode {
1325-
@SuppressWarnings("unused")
1326-
@Specialization
1327-
public Object values(Object obj) {
1328-
// pass
1329-
return PNone.NONE;
1330-
}
1331-
}
1332-
13331311
@Builtin(name = "Py_XINCREF", minNumOfPositionalArgs = 1)
13341312
@GenerateNodeFactory
1335-
public abstract static class PyXINCREFNode extends PythonUnaryBuiltinNode {
1313+
public abstract static class PyChangeREFNode extends PythonUnaryBuiltinNode {
13361314
@SuppressWarnings("unused")
13371315
@Specialization
13381316
public Object values(Object obj) {
@@ -1341,16 +1319,6 @@ public Object values(Object obj) {
13411319
}
13421320
}
13431321

1344-
@Builtin(name = "PyObject_LEN", minNumOfPositionalArgs = 1)
1345-
@GenerateNodeFactory
1346-
public abstract static class PyLenNode extends PythonUnaryBuiltinNode {
1347-
@Specialization
1348-
public Object values(VirtualFrame frame, Object obj,
1349-
@Cached PyObject_Size sizeNode) {
1350-
return sizeNode.execute(frame, obj);
1351-
}
1352-
}
1353-
13541322
///////////// set, frozenset /////////////
13551323

13561324
@Builtin(name = "PySet_New", minNumOfPositionalArgs = 1)

0 commit comments

Comments
 (0)