Skip to content

Commit 554028f

Browse files
steve-ssteve-s
committed
Introduce NbBoolBuiltinNode
1 parent 1a32ef4 commit 554028f

File tree

11 files changed

+24
-19
lines changed

11 files changed

+24
-19
lines changed

‎graalpython/com.oracle.graal.python.processor/src/com/oracle/graal/python/processor/SlotsMapping.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ static String getSlotBaseClass(Slot s) {
6161
static String getSlotNodeBaseClass(Slot s) {
6262
return switch (s.value()) {
6363
case tp_descr_get -> "com.oracle.graal.python.nodes.function.builtins.PythonTernaryBuiltinNode";
64-
case sq_length, mp_length, nb_bool, tp_get_attro ->
64+
case nb_bool -> "com.oracle.graal.python.builtins.objects.type.slots.TpSlotInquiry.NbBoolBuiltinNode";
65+
case sq_length, mp_length, tp_get_attro ->
6566
"com.oracle.graal.python.builtins.objects.type.slots." + getSlotBaseClass(s).replace(".TpSlot", ".") + "Node";
6667
case tp_descr_set -> "com.oracle.graal.python.builtins.objects.type.slots.TpSlotDescrSet.DescrSetBuiltinNode";
6768
};

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/PyCFuncPtrBuiltins.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
import com.oracle.graal.python.builtins.objects.tuple.PTuple;
110110
import com.oracle.graal.python.builtins.objects.type.TpSlots;
111111
import com.oracle.graal.python.builtins.objects.type.TypeNodes.GetNameNode;
112-
import com.oracle.graal.python.builtins.objects.type.slots.TpSlotInquiry.InquiryBuiltinNode;
112+
import com.oracle.graal.python.builtins.objects.type.slots.TpSlotInquiry.NbBoolBuiltinNode;
113113
import com.oracle.graal.python.lib.PyCallableCheckNode;
114114
import com.oracle.graal.python.lib.PyLongCheckNode;
115115
import com.oracle.graal.python.lib.PyObjectCallMethodObjArgs;
@@ -317,7 +317,7 @@ static CThunkObject _ctypes_alloc_callback(Node raisingNode, Object callable, Ob
317317
@Slot(SlotKind.nb_bool)
318318
@GenerateUncached
319319
@GenerateNodeFactory
320-
abstract static class BoolNode extends InquiryBuiltinNode {
320+
abstract static class BoolNode extends NbBoolBuiltinNode {
321321
@Specialization
322322
static boolean bool(PyCFuncPtrObject self,
323323
@Bind("this") Node inliningTarget,

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/PyCPointerBuiltins.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
import com.oracle.graal.python.builtins.objects.function.PKeyword;
8282
import com.oracle.graal.python.builtins.objects.slice.PSlice;
8383
import com.oracle.graal.python.builtins.objects.type.TpSlots;
84-
import com.oracle.graal.python.builtins.objects.type.slots.TpSlotInquiry.InquiryBuiltinNode;
84+
import com.oracle.graal.python.builtins.objects.type.slots.TpSlotInquiry.NbBoolBuiltinNode;
8585
import com.oracle.graal.python.lib.PyIndexCheckNode;
8686
import com.oracle.graal.python.lib.PyNumberAsSizeNode;
8787
import com.oracle.graal.python.nodes.PRaiseNode;
@@ -221,7 +221,7 @@ static Object set_contents(VirtualFrame frame, CDataObject self, Object value,
221221
@Slot(SlotKind.nb_bool)
222222
@GenerateUncached
223223
@GenerateNodeFactory
224-
protected abstract static class PointerBoolNode extends InquiryBuiltinNode {
224+
protected abstract static class PointerBoolNode extends NbBoolBuiltinNode {
225225

226226
@SuppressWarnings("unused")
227227
@Specialization

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/SimpleCDataBuiltins.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
import com.oracle.graal.python.builtins.objects.type.TypeNodes.GetBaseClassNode;
7272
import com.oracle.graal.python.builtins.objects.type.TypeNodes.GetNameNode;
7373
import com.oracle.graal.python.builtins.objects.type.TypeNodes.IsSameTypeNode;
74-
import com.oracle.graal.python.builtins.objects.type.slots.TpSlotInquiry.InquiryBuiltinNode;
74+
import com.oracle.graal.python.builtins.objects.type.slots.TpSlotInquiry.NbBoolBuiltinNode;
7575
import com.oracle.graal.python.nodes.PRaiseNode;
7676
import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
7777
import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
@@ -199,7 +199,7 @@ static Object Simple_from_outparm(CDataObject self,
199199
@Slot(SlotKind.nb_bool)
200200
@GenerateUncached
201201
@GenerateNodeFactory
202-
protected abstract static class SimpleBoolNode extends InquiryBuiltinNode {
202+
protected abstract static class SimpleBoolNode extends NbBoolBuiltinNode {
203203

204204
@SuppressWarnings("unused")
205205
@Specialization

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/NoneBuiltins.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
import com.oracle.graal.python.builtins.objects.object.ObjectBuiltins;
5858
import com.oracle.graal.python.builtins.objects.type.TpSlots;
5959
import com.oracle.graal.python.builtins.objects.type.slots.TpSlotGetAttr.GetAttrBuiltinNode;
60-
import com.oracle.graal.python.builtins.objects.type.slots.TpSlotInquiry.InquiryBuiltinNode;
60+
import com.oracle.graal.python.builtins.objects.type.slots.TpSlotInquiry.NbBoolBuiltinNode;
6161
import com.oracle.graal.python.nodes.ErrorMessages;
6262
import com.oracle.graal.python.nodes.PRaiseNode;
6363
import com.oracle.graal.python.nodes.attributes.LookupAttributeInMRONode;
@@ -89,7 +89,7 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
8989
@Slot(SlotKind.nb_bool)
9090
@GenerateUncached
9191
@GenerateNodeFactory
92-
abstract static class BoolNode extends InquiryBuiltinNode {
92+
abstract static class BoolNode extends NbBoolBuiltinNode {
9393
@Specialization
9494
static boolean doNone(PNone none) {
9595
assert none == PNone.NONE;

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/complex/ComplexBuiltins.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
import com.oracle.graal.python.builtins.objects.ints.PInt;
9393
import com.oracle.graal.python.builtins.objects.tuple.PTuple;
9494
import com.oracle.graal.python.builtins.objects.type.TpSlots;
95-
import com.oracle.graal.python.builtins.objects.type.slots.TpSlotInquiry.InquiryBuiltinNode;
95+
import com.oracle.graal.python.builtins.objects.type.slots.TpSlotInquiry.NbBoolBuiltinNode;
9696
import com.oracle.graal.python.lib.PyComplexCheckExactNode;
9797
import com.oracle.graal.python.lib.PyComplexCheckNode;
9898
import com.oracle.graal.python.lib.PyFloatAsDoubleNode;
@@ -808,7 +808,7 @@ private static void validateSpec(Node inliningTarget, Spec spec, PRaiseNode.Lazy
808808
@Slot(SlotKind.nb_bool)
809809
@GenerateUncached
810810
@GenerateNodeFactory
811-
abstract static class BoolNode extends InquiryBuiltinNode {
811+
abstract static class BoolNode extends NbBoolBuiltinNode {
812812
@Specialization
813813
static boolean bool(Object self,
814814
@Bind("this") Node inliningTarget,

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/floats/FloatBuiltins.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
import com.oracle.graal.python.builtins.objects.ints.PInt;
9292
import com.oracle.graal.python.builtins.objects.tuple.PTuple;
9393
import com.oracle.graal.python.builtins.objects.type.TpSlots;
94-
import com.oracle.graal.python.builtins.objects.type.slots.TpSlotInquiry.InquiryBuiltinNode;
94+
import com.oracle.graal.python.builtins.objects.type.slots.TpSlotInquiry.NbBoolBuiltinNode;
9595
import com.oracle.graal.python.lib.PyFloatCheckNode;
9696
import com.oracle.graal.python.lib.PyLongFromDoubleNode;
9797
import com.oracle.graal.python.lib.PyNumberAsSizeNode;
@@ -290,7 +290,7 @@ protected Object op(double arg) {
290290
@Slot(SlotKind.nb_bool)
291291
@GenerateUncached
292292
@GenerateNodeFactory
293-
abstract static class BoolNode extends InquiryBuiltinNode {
293+
abstract static class BoolNode extends NbBoolBuiltinNode {
294294
static boolean op(double self) {
295295
return self != 0.0;
296296
}

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/foreign/ForeignObjectBuiltins.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
import com.oracle.graal.python.builtins.objects.type.SpecialMethodSlot;
101101
import com.oracle.graal.python.builtins.objects.type.TpSlots;
102102
import com.oracle.graal.python.builtins.objects.type.slots.TpSlotGetAttr.GetAttrBuiltinNode;
103-
import com.oracle.graal.python.builtins.objects.type.slots.TpSlotInquiry.InquiryBuiltinNode;
103+
import com.oracle.graal.python.builtins.objects.type.slots.TpSlotInquiry.NbBoolBuiltinNode;
104104
import com.oracle.graal.python.builtins.objects.type.slots.TpSlotLen.LenBuiltinNode;
105105
import com.oracle.graal.python.lib.PyNumberAsSizeNode;
106106
import com.oracle.graal.python.lib.PyObjectRichCompareBool;
@@ -175,7 +175,7 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
175175
@Slot(SlotKind.nb_bool)
176176
@GenerateUncached
177177
@GenerateNodeFactory
178-
abstract static class BoolNode extends InquiryBuiltinNode {
178+
abstract static class BoolNode extends NbBoolBuiltinNode {
179179
@Specialization(limit = "getCallSiteInlineCacheMaxDepth()")
180180
static boolean bool(Object receiver,
181181
@CachedLibrary("receiver") InteropLibrary lib,

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ints/IntBuiltins.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
import com.oracle.graal.python.builtins.objects.tuple.PTuple;
126126
import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
127127
import com.oracle.graal.python.builtins.objects.type.TpSlots;
128-
import com.oracle.graal.python.builtins.objects.type.slots.TpSlotInquiry.InquiryBuiltinNode;
128+
import com.oracle.graal.python.builtins.objects.type.slots.TpSlotInquiry.NbBoolBuiltinNode;
129129
import com.oracle.graal.python.lib.PyLongCheckNode;
130130
import com.oracle.graal.python.lib.PyNumberFloatNode;
131131
import com.oracle.graal.python.lib.PyObjectHashNode;
@@ -2916,7 +2916,7 @@ protected ArgumentClinicProvider getArgumentClinic() {
29162916
@Slot(SlotKind.nb_bool)
29172917
@GenerateUncached
29182918
@GenerateNodeFactory
2919-
public abstract static class BoolNode extends InquiryBuiltinNode {
2919+
public abstract static class BoolNode extends NbBoolBuiltinNode {
29202920
@Specialization
29212921
static boolean toBoolean(boolean self) {
29222922
return self;

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/range/RangeBuiltins.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
import com.oracle.graal.python.builtins.objects.str.StringUtils.SimpleTruffleStringFormatNode;
6767
import com.oracle.graal.python.builtins.objects.tuple.PTuple;
6868
import com.oracle.graal.python.builtins.objects.type.TpSlots;
69-
import com.oracle.graal.python.builtins.objects.type.slots.TpSlotInquiry.InquiryBuiltinNode;
69+
import com.oracle.graal.python.builtins.objects.type.slots.TpSlotInquiry.NbBoolBuiltinNode;
7070
import com.oracle.graal.python.builtins.objects.type.slots.TpSlotLen.LenBuiltinNode;
7171
import com.oracle.graal.python.lib.GetNextNode;
7272
import com.oracle.graal.python.lib.PyIndexCheckNode;
@@ -225,7 +225,7 @@ public static LenNode getUncached() {
225225
@Slot(SlotKind.nb_bool)
226226
@GenerateUncached
227227
@GenerateNodeFactory
228-
abstract static class BoolNode extends InquiryBuiltinNode {
228+
abstract static class BoolNode extends NbBoolBuiltinNode {
229229
@Specialization
230230
boolean doPIntRange(PIntRange self) {
231231
return self.getIntLength() != 0;

0 commit comments

Comments
 (0)