adjust neverDefualt option for cached args

qunaibit · qunaibit · commit 136462e26194 · 2023-01-26T21:53:16.000+03:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cell/CellBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cell/CellBuiltins.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -312,7 +312,7 @@ public abstract static class GetRefNode extends PNodeWithContext {
         @Specialization(guards = {"isSingleContext()", "self == cachedSelf"}, assumptions = {"cachedSelf.isEffectivelyFinalAssumption()"}, limit = "1")
         Object cached(@NeverDefault @SuppressWarnings("unused") PCell self,
                         @SuppressWarnings("unused") @Cached("self") PCell cachedSelf,
-                        @Cached(value = "self.getRef()", neverDefault = false) Object ref) {
+                        @Cached(value = "self.getRef()") Object ref) {
             return ref;
         }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/DynamicObjectStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/DynamicObjectStorage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -209,7 +209,7 @@ static Object pstring(DynamicObjectStorage self, PString key, @SuppressWarnings(
         static Object notString(Frame frame, DynamicObjectStorage self, Object key, long hashIn,
                         @Shared("readKey") @Cached ReadAttributeFromDynamicObjectNode readKey,
                         @Exclusive @Cached("self.store.getShape()") Shape cachedShape,
-                        @Exclusive @Cached(value = "keyArray(cachedShape)", dimensions = 1, neverDefault = true) Object[] keyList,
+                        @Exclusive @Cached(value = "keyArray(cachedShape)", dimensions = 1) Object[] keyList,
                         @Shared("builtinStringProfile") @Cached IsBuiltinClassProfile profile,
                         @Shared("eqNode") @Cached PyObjectRichCompareBool.EqNode eqNode,
                         @Shared("hashNode") @Cached PyObjectHashNode hashNode,
@@ -338,7 +338,7 @@ public static DynamicObjectStorage copy(DynamicObjectStorage receiver,
                         @SuppressWarnings("unused") @Bind("receiver.store") DynamicObject store,
                         @SuppressWarnings("unused") @CachedLibrary("store") DynamicObjectLibrary dylib,
                         @Bind("dylib.getKeyArray(store)") Object[] keys,
-                        @Cached(value = "keys.length", neverDefault = false) int cachedLength,
+                        @Cached(value = "keys.length") int cachedLength,
                         @Cached("createAccess(cachedLength)") DynamicObjectLibrary[] readLib,
                         @Cached("createAccess(cachedLength)") DynamicObjectLibrary[] writeLib) {
             DynamicObject copy = new Store(PythonLanguage.get(dylib).getEmptyShape());
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/KeywordsStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/KeywordsStorage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -112,7 +112,7 @@ public abstract static class GetItemNode extends Node {
 
         @Specialization(guards = {"self.length() == cachedLen", "cachedLen < 6"}, limit = "1")
         static Object cached(KeywordsStorage self, TruffleString key, @SuppressWarnings("unused") long hash,
-                        @SuppressWarnings("unused") @Exclusive @Cached(value = "self.length()", neverDefault = false) int cachedLen,
+                        @SuppressWarnings("unused") @Exclusive @Cached(value = "self.length()") int cachedLen,
                         @Shared("tsEqual") @Cached TruffleString.EqualNode equalNode) {
             final int idx = self.findCachedStringKey(key, cachedLen, equalNode);
             return idx != -1 ? self.keywords[idx].getValue() : null;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/LocalsStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/LocalsStorage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -109,7 +109,7 @@ abstract static class LengthNode extends Node {
         @Specialization(guards = "desc == self.frame.getFrameDescriptor()", limit = "1")
         @ExplodeLoop
         static int getLengthCached(LocalsStorage self,
-                        @Cached(value = "self.frame.getFrameDescriptor()", neverDefault = true) FrameDescriptor desc) {
+                        @Cached(value = "self.frame.getFrameDescriptor()") FrameDescriptor desc) {
             int size = desc.getNumberOfSlots();
             for (int slot = 0; slot < desc.getNumberOfSlots(); slot++) {
                 Object identifier = desc.getSlotName(slot);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/SequenceStorageNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/SequenceStorageNodes.java
@@ -1880,7 +1880,7 @@ static byte[] doNativeByte(NativeSequenceStorage s,
         static byte[] doGenericLenCached(SequenceStorage s,
                         @Shared("getItemNode") @Cached GetItemScalarNode getItemNode,
                         @Cached CastToJavaByteNode castToByteNode,
-                        @Cached(value = "s.length()", neverDefault = false) int cachedLen) {
+                        @Cached(value = "s.length()") int cachedLen) {
             byte[] barr = new byte[cachedLen];
             for (int i = 0; i < cachedLen; i++) {
                 barr[i] = castToByteNode.execute(getItemNode.execute(s, i));
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/StringBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/StringBuiltins.java
@@ -2492,7 +2492,7 @@ static TruffleString doEmptySlice(@SuppressWarnings("unused") TruffleString valu
 
         @Specialization(guards = {"step == slice.step", "!isSimpleSlice(slice)", "!isEmptySlice(slice)"}, limit = "1")
         static TruffleString doGenericCachedStep(TruffleString value, SliceInfo slice,
-                        @Cached(value = "slice.step", neverDefault = false) int step,
+                        @Cached(value = "slice.step") int step,
                         @Shared("loop") @Cached("createCountingProfile()") LoopConditionProfile loopProfile,
                         @Shared("len") @Cached LenOfRangeNode sliceLen,
                         @Shared("appendCP") @Cached TruffleStringBuilder.AppendCodePointNode appendCodePointNode,
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/superobject/SuperBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/superobject/SuperBuiltins.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -124,7 +124,7 @@ abstract static class GetTypeNode extends PNodeWithContext {
         @Specialization(guards = {"isSingleContext()", "self == cachedSelf"}, assumptions = {"cachedSelf.getNeverReinitializedAssumption()"}, limit = "1")
         static Object cached(@NeverDefault @SuppressWarnings("unused") SuperObject self,
                         @SuppressWarnings("unused") @Cached("self") SuperObject cachedSelf,
-                        @Cached(value = "self.getType()", neverDefault = false) Object type) {
+                        @Cached(value = "self.getType()") Object type) {
             return type;
         }
 
@@ -141,7 +141,7 @@ abstract static class GetObjectTypeNode extends PNodeWithContext {
         @Specialization(guards = {"isSingleContext()", "self == cachedSelf"}, assumptions = {"cachedSelf.getNeverReinitializedAssumption()"}, limit = "1")
         static Object cached(@NeverDefault @SuppressWarnings("unused") SuperObject self,
                         @SuppressWarnings("unused") @Cached("self") SuperObject cachedSelf,
-                        @Cached(value = "self.getObjectType()", neverDefault = false) Object type) {
+                        @Cached(value = "self.getObjectType()") Object type) {
             return type;
         }
 
@@ -158,7 +158,7 @@ abstract static class GetObjectNode extends PNodeWithContext {
         @Specialization(guards = {"isSingleContext()", "self == cachedSelf"}, assumptions = {"cachedSelf.getNeverReinitializedAssumption()"}, limit = "1")
         static Object cached(@NeverDefault @SuppressWarnings("unused") SuperObject self,
                         @SuppressWarnings("unused") @Cached("self") SuperObject cachedSelf,
-                        @Cached(value = "self.getObject()", neverDefault = false) Object object) {
+                        @Cached(value = "self.getObject()") Object object) {
             return object;
         }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/PythonClass.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/PythonClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2023, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/argument/CreateArgumentsNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/argument/CreateArgumentsNode.java
@@ -235,9 +235,9 @@ Object[] doCached0(PythonObject callable, Object[] userArguments, PKeyword[] key
                         @Shared("applyPositional") @Cached ApplyPositionalArguments applyPositional,
                         @Shared("fillDefaultsNode") @Cached FillDefaultsNode fillDefaultsNode,
                         @Shared("fillKwDefaultsNode") @Cached FillKwDefaultsNode fillKwDefaultsNode,
-                        @Cached(value = "userArguments.length", neverDefault = false) int cachedLength,
-                        @Cached(value = "signature.getMaxNumOfPositionalArgs()", neverDefault = false) int cachedMaxPos,
-                        @Cached(value = "signature.getNumOfRequiredKeywords()", neverDefault = false) int cachedNumKwds,
+                        @Cached(value = "userArguments.length") int cachedLength,
+                        @Cached(value = "signature.getMaxNumOfPositionalArgs()") int cachedMaxPos,
+                        @Cached(value = "signature.getNumOfRequiredKeywords()") int cachedNumKwds,
                         @Shared("checkEnclosingTypeNode") @Cached CheckEnclosingTypeNode checkEnclosingTypeNode) {
 
             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
                         @Shared("applyPositional") @Cached ApplyPositionalArguments applyPositional,
                         @Shared("fillDefaultsNode") @Cached FillDefaultsNode fillDefaultsNode,
                         @Shared("fillKwDefaultsNode") @Cached FillKwDefaultsNode fillKwDefaultsNode,
-                        @Cached(value = "userArguments.length", neverDefault = false) int cachedLength,
+                        @Cached(value = "userArguments.length") int cachedLength,
                         @Shared("checkEnclosingTypeNode") @Cached CheckEnclosingTypeNode checkEnclosingTypeNode) {
 
             return createAndCheckArguments(callable, userArguments, cachedLength, keywords, signature, self, classObject, defaults, kwdefaults, methodcall, signature.getMaxNumOfPositionalArgs(),
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/argument/ReadVarKeywordsNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/argument/ReadVarKeywordsNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2023, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -96,7 +96,7 @@ private Object returnValue(PKeyword[] keywords) {
 
     @Specialization(guards = {"getKwargLen(frame) == cachedLen", "cachedLen == 0"}, limit = "1")
     Object noKeywordArgs(@SuppressWarnings("unused") VirtualFrame frame,
-                    @SuppressWarnings("unused") @Cached(value = "getAndCheckKwargLen(frame)", neverDefault = false) int cachedLen) {
+                    @SuppressWarnings("unused") @Cached(value = "getAndCheckKwargLen(frame)") int cachedLen) {
         return returnValue(PKeyword.EMPTY_KEYWORDS);
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/MaterializeFrameNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/MaterializeFrameNode.java
@@ -124,7 +124,7 @@ public final PFrame execute(Frame frame, Node location, boolean markAsEscaped, b
                     "!hasCustomLocals(frameToMaterialize)"}, limit = "1")
     static PFrame freshPFrameCachedFD(VirtualFrame frame, Node location, boolean markAsEscaped, boolean forceSync,
                     @SuppressWarnings("unused") boolean updateLocationIfMissing, Frame frameToMaterialize,
-                    @Cached(value = "frameToMaterialize.getFrameDescriptor()", neverDefault = true) FrameDescriptor cachedFD,
+                    @Cached(value = "frameToMaterialize.getFrameDescriptor()") FrameDescriptor cachedFD,
                     @Shared("factory") @Cached PythonObjectFactory factory,
                     @Shared("syncValuesNode") @Cached SyncFrameValuesNode syncValuesNode) {
         PDict locals = factory.createDictLocals(cachedFD);
@@ -251,7 +251,7 @@ public abstract static class SyncFrameValuesNode extends Node {
         @ExplodeLoop
         static void doLocalsStorageCachedExploded(PFrame pyFrame, Frame frameToSync, @SuppressWarnings("unused") Node location,
                         @Cached("createClassProfile()") ValueProfile frameProfile,
-                        @Cached(value = "frameToSync.getFrameDescriptor()", neverDefault = true) FrameDescriptor cachedFd) {
+                        @Cached(value = "frameToSync.getFrameDescriptor()") FrameDescriptor cachedFd) {
             LocalsStorage localsStorage = getLocalsStorage(pyFrame);
             MaterializedFrame target = frameProfile.profile(localsStorage.getFrame());
             assert cachedFd == target.getFrameDescriptor();
@@ -265,7 +265,7 @@ static void doLocalsStorageCachedExploded(PFrame pyFrame, Frame frameToSync, @Su
                         "frameToSync.getFrameDescriptor() == cachedFd"}, replaces = "doLocalsStorageCachedExploded", limit = "1")
         static void doLocalsStorageCachedLoop(PFrame pyFrame, Frame frameToSync, @SuppressWarnings("unused") Node location,
                         @Cached("createClassProfile()") ValueProfile frameProfile,
-                        @Cached(value = "frameToSync.getFrameDescriptor()", neverDefault = true) FrameDescriptor cachedFd) {
+                        @Cached(value = "frameToSync.getFrameDescriptor()") FrameDescriptor cachedFd) {
             LocalsStorage localsStorage = getLocalsStorage(pyFrame);
             MaterializedFrame target = frameProfile.profile(localsStorage.getFrame());
             assert cachedFd == target.getFrameDescriptor();

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`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.`
`3`	`3`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`4`	`4`	`*`
`5`	`5`	`* The Universal Permissive License (UPL), Version 1.0`
`@@ -312,7 +312,7 @@ public abstract static class GetRefNode extends PNodeWithContext {`
`312`	`312`	`@Specialization(guards = {"isSingleContext()", "self == cachedSelf"}, assumptions = {"cachedSelf.isEffectivelyFinalAssumption()"}, limit = "1")`
`313`	`313`	`Object cached(@NeverDefault @SuppressWarnings("unused") PCell self,`
`314`	`314`	`@SuppressWarnings("unused") @Cached("self") PCell cachedSelf,`
`315`		`- @Cached(value = "self.getRef()", neverDefault = false) Object ref) {`
	`315`	`+ @Cached(value = "self.getRef()") Object ref) {`
`316`	`316`	`return ref;`
`317`	`317`	`}`
`318`	`318`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2017, 2022, Oracle and/or its affiliates.`
	`2`	`+ * Copyright (c) 2017, 2023, Oracle and/or its affiliates.`
`3`	`3`	`* Copyright (c) 2013, Regents of the University of California`
`4`	`4`	`*`
`5`	`5`	`* All rights reserved.`