Skip to content

Commit 14717d5

Browse files
committed
remove dead code in SequenceStorageNodes.GetItemNode
1 parent 16152ac commit 14717d5

File tree

1 file changed

+5
-37
lines changed

1 file changed

+5
-37
lines changed

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

Lines changed: 5 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -441,13 +441,10 @@ public abstract static class GetItemNode extends NormalizingNode {
441441

442442
@Child private GetItemScalarNode getItemScalarNode;
443443
@Child private GetItemSliceNode getItemSliceNode;
444-
@Child private PRaiseNode raiseNode;
445-
private final TruffleString keyTypeErrorMessage;
446444
private final BiFunction<SequenceStorage, PythonObjectFactory, Object> factoryMethod;
447445

448-
public GetItemNode(NormalizeIndexNode normalizeIndexNode, TruffleString keyTypeErrorMessage, BiFunction<SequenceStorage, PythonObjectFactory, Object> factoryMethod) {
446+
public GetItemNode(NormalizeIndexNode normalizeIndexNode, BiFunction<SequenceStorage, PythonObjectFactory, Object> factoryMethod) {
449447
super(normalizeIndexNode);
450-
this.keyTypeErrorMessage = keyTypeErrorMessage;
451448
this.factoryMethod = factoryMethod;
452449
}
453450

@@ -499,11 +496,6 @@ protected Object doSlice(VirtualFrame frame, SequenceStorage storage, PSlice sli
499496
throw new IllegalStateException();
500497
}
501498

502-
@Fallback
503-
protected Object doInvalidKey(@SuppressWarnings("unused") SequenceStorage storage, Object key) {
504-
throw ensureRaiseNode().raise(TypeError, keyTypeErrorMessage, key);
505-
}
506-
507499
private GetItemScalarNode getGetItemScalarNode() {
508500
if (getItemScalarNode == null) {
509501
CompilerDirectives.transferToInterpreterAndInvalidate();
@@ -520,44 +512,20 @@ private GetItemSliceNode getGetItemSliceNode() {
520512
return getItemSliceNode;
521513
}
522514

523-
private PRaiseNode ensureRaiseNode() {
524-
if (raiseNode == null) {
525-
CompilerDirectives.transferToInterpreterAndInvalidate();
526-
raiseNode = insert(PRaiseNode.create());
527-
}
528-
return raiseNode;
529-
}
530-
531515
public static GetItemNode createNotNormalized() {
532-
return GetItemNodeGen.create(null, ErrorMessages.OBJ_INDEX_MUST_BE_INT_OR_SLICES, null);
516+
return GetItemNodeGen.create(null, null);
533517
}
534518

535519
public static GetItemNode create(NormalizeIndexNode normalizeIndexNode) {
536-
return GetItemNodeGen.create(normalizeIndexNode, ErrorMessages.OBJ_INDEX_MUST_BE_INT_OR_SLICES, null);
520+
return GetItemNodeGen.create(normalizeIndexNode, null);
537521
}
538522

539523
public static GetItemNode create() {
540-
return GetItemNodeGen.create(NormalizeIndexNode.create(), ErrorMessages.OBJ_INDEX_MUST_BE_INT_OR_SLICES, null);
541-
}
542-
543-
public static GetItemNode createNotNormalized(TruffleString keyTypeErrorMessage) {
544-
return GetItemNodeGen.create(null, keyTypeErrorMessage, null);
545-
}
546-
547-
public static GetItemNode create(NormalizeIndexNode normalizeIndexNode, TruffleString keyTypeErrorMessage) {
548-
return GetItemNodeGen.create(normalizeIndexNode, keyTypeErrorMessage, null);
549-
}
550-
551-
public static GetItemNode create(TruffleString keyTypeErrorMessage) {
552-
return GetItemNodeGen.create(NormalizeIndexNode.create(), keyTypeErrorMessage, null);
553-
}
554-
555-
public static GetItemNode create(NormalizeIndexNode normalizeIndexNode, TruffleString keyTypeErrorMessage, BiFunction<SequenceStorage, PythonObjectFactory, Object> factoryMethod) {
556-
return GetItemNodeGen.create(normalizeIndexNode, keyTypeErrorMessage, factoryMethod);
524+
return GetItemNodeGen.create(NormalizeIndexNode.create(), null);
557525
}
558526

559527
public static GetItemNode create(NormalizeIndexNode normalizeIndexNode, BiFunction<SequenceStorage, PythonObjectFactory, Object> factoryMethod) {
560-
return GetItemNodeGen.create(normalizeIndexNode, ErrorMessages.OBJ_INDEX_MUST_BE_INT_OR_SLICES, factoryMethod);
528+
return GetItemNodeGen.create(normalizeIndexNode, factoryMethod);
561529
}
562530

563531
}

0 commit comments

Comments
 (0)