Skip to content

Commit cc795b8

Browse files
committed
Fix ArrayBased storage guards
1 parent 2cb20be commit cc795b8

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1187,7 +1187,7 @@ protected static void doArrayBasedMove(ArrayBasedSequenceStorage storage, int di
11871187
PythonUtils.arraycopy(array, srcPos, array, distPos, length);
11881188
}
11891189

1190-
@Specialization(guards = {"length > 0", "!isBasicSequenceStorage(storage)"})
1190+
@Specialization(guards = {"length > 0", "!isArrayBasedSequenceStorage(storage)"})
11911191
protected static void doOther(Node inliningTarget, SequenceStorage storage, int distPos, int srcPos, int length,
11921192
@Cached SetItemScalarNode setLeftItemNode,
11931193
@Cached GetItemScalarNode getRightItemNode) {
@@ -1196,8 +1196,8 @@ protected static void doOther(Node inliningTarget, SequenceStorage storage, int
11961196
}
11971197
}
11981198

1199-
protected static boolean isBasicSequenceStorage(Object o) {
1200-
return o instanceof BasicSequenceStorage;
1199+
protected static boolean isArrayBasedSequenceStorage(Object o) {
1200+
return o instanceof ArrayBasedSequenceStorage;
12011201
}
12021202
}
12031203

@@ -1222,7 +1222,7 @@ protected static void doArrayBasedCopy(ArrayBasedSequenceStorage dist, int distP
12221222
PythonUtils.arraycopy(srcArray, srcPos, distArray, distPos, length);
12231223
}
12241224

1225-
@Specialization(guards = {"length > 0", "!isBasicSequenceStorage(dist) || dist.getClass() != src.getClass()"})
1225+
@Specialization(guards = {"length > 0", "!isArrayBasedSequenceStorage(dist) || dist.getClass() != src.getClass()"})
12261226
protected static void doOther(Node inliningTarget, SequenceStorage dist, int distPos, SequenceStorage src, int srcPos, int length,
12271227
@Cached SetItemScalarNode setLeftItemNode,
12281228
@Cached GetItemScalarNode getRightItemNode) {
@@ -1231,8 +1231,8 @@ protected static void doOther(Node inliningTarget, SequenceStorage dist, int dis
12311231
}
12321232
}
12331233

1234-
protected static boolean isBasicSequenceStorage(Object o) {
1235-
return o instanceof BasicSequenceStorage;
1234+
protected static boolean isArrayBasedSequenceStorage(Object o) {
1235+
return o instanceof ArrayBasedSequenceStorage;
12361236
}
12371237
}
12381238

@@ -1461,7 +1461,7 @@ static void singleStep(SequenceStorage self, int lo, int hi, SequenceStorage dat
14611461
}
14621462
}
14631463

1464-
protected static boolean replacesWholeSequence(Class<? extends BasicSequenceStorage> cachedClass, BasicSequenceStorage s, SliceInfo info) {
1464+
protected static boolean replacesWholeSequence(Class<? extends ArrayBasedSequenceStorage> cachedClass, ArrayBasedSequenceStorage s, SliceInfo info) {
14651465
return info.start == 0 && info.step == 1 && info.stop == cachedClass.cast(s).length();
14661466
}
14671467
}

0 commit comments

Comments
 (0)