Skip to content

Commit 1e7b121

Browse files
qunaibitqunaibit
committed
[GR-21590] Update imports
PullRequest: graalpython/2616
2 parents 7b2e6ca + 136462e commit 1e7b121

File tree

13 files changed

+30
-30
lines changed

13 files changed

+30
-30
lines changed

‎ci.jsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{ "overlay": "2b4edda59537a395dd02ca1de9b38edd10f8eba7" }
1+
{ "overlay": "0ef4a52d14a25eb949b5bd26f07c26072599f3c1" }

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* The Universal Permissive License (UPL), Version 1.0
@@ -312,7 +312,7 @@ public abstract static class GetRefNode extends PNodeWithContext {
312312
@Specialization(guards = {"isSingleContext()", "self == cachedSelf"}, assumptions = {"cachedSelf.isEffectivelyFinalAssumption()"}, limit = "1")
313313
Object cached(@NeverDefault @SuppressWarnings("unused") PCell self,
314314
@SuppressWarnings("unused") @Cached("self") PCell cachedSelf,
315-
@Cached(value = "self.getRef()", neverDefault = false) Object ref) {
315+
@Cached(value = "self.getRef()") Object ref) {
316316
return ref;
317317
}
318318

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* The Universal Permissive License (UPL), Version 1.0
@@ -209,7 +209,7 @@ static Object pstring(DynamicObjectStorage self, PString key, @SuppressWarnings(
209209
static Object notString(Frame frame, DynamicObjectStorage self, Object key, long hashIn,
210210
@Shared("readKey") @Cached ReadAttributeFromDynamicObjectNode readKey,
211211
@Exclusive @Cached("self.store.getShape()") Shape cachedShape,
212-
@Exclusive @Cached(value = "keyArray(cachedShape)", dimensions = 1, neverDefault = true) Object[] keyList,
212+
@Exclusive @Cached(value = "keyArray(cachedShape)", dimensions = 1) Object[] keyList,
213213
@Shared("builtinStringProfile") @Cached IsBuiltinClassProfile profile,
214214
@Shared("eqNode") @Cached PyObjectRichCompareBool.EqNode eqNode,
215215
@Shared("hashNode") @Cached PyObjectHashNode hashNode,
@@ -338,7 +338,7 @@ public static DynamicObjectStorage copy(DynamicObjectStorage receiver,
338338
@SuppressWarnings("unused") @Bind("receiver.store") DynamicObject store,
339339
@SuppressWarnings("unused") @CachedLibrary("store") DynamicObjectLibrary dylib,
340340
@Bind("dylib.getKeyArray(store)") Object[] keys,
341-
@Cached(value = "keys.length", neverDefault = false) int cachedLength,
341+
@Cached(value = "keys.length") int cachedLength,
342342
@Cached("createAccess(cachedLength)") DynamicObjectLibrary[] readLib,
343343
@Cached("createAccess(cachedLength)") DynamicObjectLibrary[] writeLib) {
344344
DynamicObject copy = new Store(PythonLanguage.get(dylib).getEmptyShape());

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* The Universal Permissive License (UPL), Version 1.0
@@ -112,7 +112,7 @@ public abstract static class GetItemNode extends Node {
112112

113113
@Specialization(guards = {"self.length() == cachedLen", "cachedLen < 6"}, limit = "1")
114114
static Object cached(KeywordsStorage self, TruffleString key, @SuppressWarnings("unused") long hash,
115-
@SuppressWarnings("unused") @Exclusive @Cached(value = "self.length()", neverDefault = false) int cachedLen,
115+
@SuppressWarnings("unused") @Exclusive @Cached(value = "self.length()") int cachedLen,
116116
@Shared("tsEqual") @Cached TruffleString.EqualNode equalNode) {
117117
final int idx = self.findCachedStringKey(key, cachedLen, equalNode);
118118
return idx != -1 ? self.keywords[idx].getValue() : null;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* The Universal Permissive License (UPL), Version 1.0
@@ -109,7 +109,7 @@ abstract static class LengthNode extends Node {
109109
@Specialization(guards = "desc == self.frame.getFrameDescriptor()", limit = "1")
110110
@ExplodeLoop
111111
static int getLengthCached(LocalsStorage self,
112-
@Cached(value = "self.frame.getFrameDescriptor()", neverDefault = true) FrameDescriptor desc) {
112+
@Cached(value = "self.frame.getFrameDescriptor()") FrameDescriptor desc) {
113113
int size = desc.getNumberOfSlots();
114114
for (int slot = 0; slot < desc.getNumberOfSlots(); slot++) {
115115
Object identifier = desc.getSlotName(slot);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1880,7 +1880,7 @@ static byte[] doNativeByte(NativeSequenceStorage s,
18801880
static byte[] doGenericLenCached(SequenceStorage s,
18811881
@Shared("getItemNode") @Cached GetItemScalarNode getItemNode,
18821882
@Cached CastToJavaByteNode castToByteNode,
1883-
@Cached(value = "s.length()", neverDefault = false) int cachedLen) {
1883+
@Cached(value = "s.length()") int cachedLen) {
18841884
byte[] barr = new byte[cachedLen];
18851885
for (int i = 0; i < cachedLen; i++) {
18861886
barr[i] = castToByteNode.execute(getItemNode.execute(s, i));

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2492,7 +2492,7 @@ static TruffleString doEmptySlice(@SuppressWarnings("unused") TruffleString valu
24922492

24932493
@Specialization(guards = {"step == slice.step", "!isSimpleSlice(slice)", "!isEmptySlice(slice)"}, limit = "1")
24942494
static TruffleString doGenericCachedStep(TruffleString value, SliceInfo slice,
2495-
@Cached(value = "slice.step", neverDefault = false) int step,
2495+
@Cached(value = "slice.step") int step,
24962496
@Shared("loop") @Cached("createCountingProfile()") LoopConditionProfile loopProfile,
24972497
@Shared("len") @Cached LenOfRangeNode sliceLen,
24982498
@Shared("appendCP") @Cached TruffleStringBuilder.AppendCodePointNode appendCodePointNode,

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* The Universal Permissive License (UPL), Version 1.0
@@ -124,7 +124,7 @@ abstract static class GetTypeNode extends PNodeWithContext {
124124
@Specialization(guards = {"isSingleContext()", "self == cachedSelf"}, assumptions = {"cachedSelf.getNeverReinitializedAssumption()"}, limit = "1")
125125
static Object cached(@NeverDefault @SuppressWarnings("unused") SuperObject self,
126126
@SuppressWarnings("unused") @Cached("self") SuperObject cachedSelf,
127-
@Cached(value = "self.getType()", neverDefault = false) Object type) {
127+
@Cached(value = "self.getType()") Object type) {
128128
return type;
129129
}
130130

@@ -141,7 +141,7 @@ abstract static class GetObjectTypeNode extends PNodeWithContext {
141141
@Specialization(guards = {"isSingleContext()", "self == cachedSelf"}, assumptions = {"cachedSelf.getNeverReinitializedAssumption()"}, limit = "1")
142142
static Object cached(@NeverDefault @SuppressWarnings("unused") SuperObject self,
143143
@SuppressWarnings("unused") @Cached("self") SuperObject cachedSelf,
144-
@Cached(value = "self.getObjectType()", neverDefault = false) Object type) {
144+
@Cached(value = "self.getObjectType()") Object type) {
145145
return type;
146146
}
147147

@@ -158,7 +158,7 @@ abstract static class GetObjectNode extends PNodeWithContext {
158158
@Specialization(guards = {"isSingleContext()", "self == cachedSelf"}, assumptions = {"cachedSelf.getNeverReinitializedAssumption()"}, limit = "1")
159159
static Object cached(@NeverDefault @SuppressWarnings("unused") SuperObject self,
160160
@SuppressWarnings("unused") @Cached("self") SuperObject cachedSelf,
161-
@Cached(value = "self.getObject()", neverDefault = false) Object object) {
161+
@Cached(value = "self.getObject()") Object object) {
162162
return object;
163163
}
164164

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2022, Oracle and/or its affiliates.
2+
* Copyright (c) 2017, 2023, Oracle and/or its affiliates.
33
* Copyright (c) 2013, Regents of the University of California
44
*
55
* All rights reserved.

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/argument/CreateArgumentsNode.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -235,9 +235,9 @@ Object[] doCached0(PythonObject callable, Object[] userArguments, PKeyword[] key
235235
@Shared("applyPositional") @Cached ApplyPositionalArguments applyPositional,
236236
@Shared("fillDefaultsNode") @Cached FillDefaultsNode fillDefaultsNode,
237237
@Shared("fillKwDefaultsNode") @Cached FillKwDefaultsNode fillKwDefaultsNode,
238-
@Cached(value = "userArguments.length", neverDefault = false) int cachedLength,
239-
@Cached(value = "signature.getMaxNumOfPositionalArgs()", neverDefault = false) int cachedMaxPos,
240-
@Cached(value = "signature.getNumOfRequiredKeywords()", neverDefault = false) int cachedNumKwds,
238+
@Cached(value = "userArguments.length") int cachedLength,
239+
@Cached(value = "signature.getMaxNumOfPositionalArgs()") int cachedMaxPos,
240+
@Cached(value = "signature.getNumOfRequiredKeywords()") int cachedNumKwds,
241241
@Shared("checkEnclosingTypeNode") @Cached CheckEnclosingTypeNode checkEnclosingTypeNode) {
242242

243243
return createAndCheckArguments(callable, userArguments, cachedLength, keywords, signature, self, classObject, defaults, kwdefaults, methodcall, cachedMaxPos, cachedNumKwds,
@@ -253,7 +253,7 @@ Object[] doCached(PythonObject callable, Object[] userArguments, PKeyword[] keyw
253253
@Shared("applyPositional") @Cached ApplyPositionalArguments applyPositional,
254254
@Shared("fillDefaultsNode") @Cached FillDefaultsNode fillDefaultsNode,
255255
@Shared("fillKwDefaultsNode") @Cached FillKwDefaultsNode fillKwDefaultsNode,
256-
@Cached(value = "userArguments.length", neverDefault = false) int cachedLength,
256+
@Cached(value = "userArguments.length") int cachedLength,
257257
@Shared("checkEnclosingTypeNode") @Cached CheckEnclosingTypeNode checkEnclosingTypeNode) {
258258

259259
return createAndCheckArguments(callable, userArguments, cachedLength, keywords, signature, self, classObject, defaults, kwdefaults, methodcall, signature.getMaxNumOfPositionalArgs(),

0 commit comments

Comments
 (0)