Skip to content

Commit 910f33c

Browse files
fangererfangerer
committed
Remove obsolete 'SequenceStorageNodes.EqNode'.
1 parent df9b351 commit 910f33c

File tree

4 files changed

+7
-108
lines changed

4 files changed

+7
-108
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ protected boolean isValidIndexType(Object idx) {
181181
@Builtin(name = __EQ__, fixedNumOfArguments = 2)
182182
@GenerateNodeFactory
183183
public abstract static class EqNode extends PythonBinaryBuiltinNode {
184-
@Child SequenceStorageNodes.EqNode eqNode;
184+
@Child SequenceStorageNodes.CmpNode eqNode;
185185

186186
@Specialization
187187
public boolean eq(PByteArray self, PByteArray other) {
@@ -202,10 +202,10 @@ public Object eq(Object self, Object other) {
202202
throw raise(TypeError, "descriptor '__eq__' requires a 'bytearray' object but received a '%p'", self);
203203
}
204204

205-
private SequenceStorageNodes.EqNode getEqNode() {
205+
private SequenceStorageNodes.CmpNode getEqNode() {
206206
if (eqNode == null) {
207207
CompilerDirectives.transferToInterpreterAndInvalidate();
208-
eqNode = insert(SequenceStorageNodes.EqNode.create());
208+
eqNode = insert(SequenceStorageNodes.CmpNode.createEq());
209209
}
210210
return eqNode;
211211
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public PNone init(Object self, Object args, Object kwargs) {
106106
@Builtin(name = __EQ__, fixedNumOfArguments = 2)
107107
@GenerateNodeFactory
108108
public abstract static class EqNode extends PythonBinaryBuiltinNode {
109-
@Child SequenceStorageNodes.EqNode eqNode;
109+
@Child SequenceStorageNodes.CmpNode eqNode;
110110

111111
@Specialization
112112
public boolean eq(PBytes self, PByteArray other) {
@@ -127,10 +127,10 @@ public Object eq(Object self, Object other) {
127127
throw raise(TypeError, "descriptor '__eq__' requires a 'bytes' object but received a '%p'", self);
128128
}
129129

130-
private SequenceStorageNodes.EqNode getEqNode() {
130+
private SequenceStorageNodes.CmpNode getEqNode() {
131131
if (eqNode == null) {
132132
CompilerDirectives.transferToInterpreterAndInvalidate();
133-
eqNode = insert(SequenceStorageNodes.EqNode.create());
133+
eqNode = insert(SequenceStorageNodes.CmpNode.createEq());
134134
}
135135
return eqNode;
136136
}

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

Lines changed: 0 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodesFactory.CmpNodeGen;
2020
import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodesFactory.ConcatNodeGen;
2121
import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodesFactory.ContainsNodeGen;
22-
import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodesFactory.EqNodeGen;
2322
import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodesFactory.GetItemNodeGen;
2423
import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodesFactory.GetItemScalarNodeGen;
2524
import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodesFactory.GetItemSliceNodeGen;
@@ -1274,106 +1273,6 @@ public static CmpNode createEq() {
12741273
}
12751274
}
12761275

1277-
public abstract static class EqNode extends SequenceStorageBaseNode {
1278-
@Child private GetItemScalarNode getItemNode;
1279-
@Child private GetItemScalarNode getRightItemNode;
1280-
@Child private BinaryComparisonNode equalsNode;
1281-
@Child private CastToBooleanNode castToBooleanNode;
1282-
1283-
public abstract boolean execute(SequenceStorage left, SequenceStorage right);
1284-
1285-
@Specialization(guards = {"isEmpty(left)", "isEmpty(right)"})
1286-
boolean doEmpty(@SuppressWarnings("unused") SequenceStorage left, @SuppressWarnings("unused") SequenceStorage right) {
1287-
return true;
1288-
}
1289-
1290-
@Specialization(guards = {"left.getClass() == right.getClass()", "!isNative(left)"})
1291-
boolean doManagedManagedSameType(SequenceStorage left, SequenceStorage right) {
1292-
assert !isNative(right);
1293-
// TODO type profile or cache on class
1294-
return left.equals(right);
1295-
}
1296-
1297-
@Specialization(guards = "left.getElementType() == right.getElementType()")
1298-
boolean doNativeNativeSameType(NativeSequenceStorage left, NativeSequenceStorage right) {
1299-
// TODO profile or guard !
1300-
if (left.length() != right.length()) {
1301-
return false;
1302-
}
1303-
for (int i = 0; i < left.length(); i++) {
1304-
// use the same 'getItemNode'
1305-
Object leftItem = getGetItemNode().execute(left, i);
1306-
Object rightItem = getGetItemNode().execute(right, i);
1307-
if (!eq(leftItem, rightItem)) {
1308-
return false;
1309-
}
1310-
}
1311-
return true;
1312-
}
1313-
1314-
@Specialization(guards = {"!isNative(left)", "compatible(left, right)"})
1315-
boolean doManagedNative(SequenceStorage left, NativeSequenceStorage right) {
1316-
// TODO profile or guard !
1317-
if (left.length() != right.length()) {
1318-
return false;
1319-
}
1320-
for (int i = 0; i < left.length(); i++) {
1321-
Object leftItem = getGetItemNode().execute(left, i);
1322-
Object rightItem = getGetRightItemNode().execute(right, i);
1323-
if (!eq(leftItem, rightItem)) {
1324-
return false;
1325-
}
1326-
}
1327-
return true;
1328-
}
1329-
1330-
@Specialization(guards = {"!isNative(right)", "compatible(right, left)"})
1331-
boolean doNatveManaged(NativeSequenceStorage left, SequenceStorage right) {
1332-
return doManagedNative(right, left);
1333-
}
1334-
1335-
@Fallback
1336-
boolean doFallback(@SuppressWarnings("unused") SequenceStorage left, @SuppressWarnings("unused") SequenceStorage right) {
1337-
return false;
1338-
}
1339-
1340-
private GetItemScalarNode getGetItemNode() {
1341-
if (getItemNode == null) {
1342-
CompilerDirectives.transferToInterpreterAndInvalidate();
1343-
getItemNode = insert(GetItemScalarNode.create());
1344-
}
1345-
return getItemNode;
1346-
}
1347-
1348-
private GetItemScalarNode getGetRightItemNode() {
1349-
if (getRightItemNode == null) {
1350-
CompilerDirectives.transferToInterpreterAndInvalidate();
1351-
getRightItemNode = insert(GetItemScalarNode.create());
1352-
}
1353-
return getRightItemNode;
1354-
}
1355-
1356-
private boolean eq(Object left, Object right) {
1357-
if (equalsNode == null) {
1358-
CompilerDirectives.transferToInterpreterAndInvalidate();
1359-
equalsNode = insert(BinaryComparisonNode.create(__EQ__, __EQ__, "=="));
1360-
}
1361-
return castToBoolean(equalsNode.executeWith(left, right));
1362-
}
1363-
1364-
private boolean castToBoolean(Object value) {
1365-
if (castToBooleanNode == null) {
1366-
CompilerDirectives.transferToInterpreterAndInvalidate();
1367-
castToBooleanNode = insert(CastToBooleanNode.createIfTrueNode());
1368-
}
1369-
return castToBooleanNode.executeWith(value);
1370-
}
1371-
1372-
public static EqNode create() {
1373-
return EqNodeGen.create();
1374-
}
1375-
}
1376-
13771276
public abstract static class NormalizeIndexNode extends PBaseNode {
13781277
public static final String INDEX_OUT_OF_BOUNDS = "index out of range";
13791278
public static final String RANGE_OUT_OF_BOUNDS = "range index out of range";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ abstract static class EqNode extends PythonBinaryBuiltinNode {
358358

359359
@Specialization
360360
boolean doPTuple(PTuple left, PTuple right,
361-
@Cached("create()") SequenceStorageNodes.EqNode eqNode) {
361+
@Cached("createEq()") SequenceStorageNodes.CmpNode eqNode) {
362362
return eqNode.execute(left.getSequenceStorage(), right.getSequenceStorage());
363363
}
364364

0 commit comments

Comments
 (0)