add missing @idempotent annotations

cosminbasca · cosminbasca · commit fb1489a54a08 · 2023-02-26T23:14:50.000+01:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CExtNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CExtNodes.java
@@ -187,6 +187,7 @@
 import com.oracle.truffle.api.dsl.Cached.Shared;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.GenerateUncached;
+import com.oracle.truffle.api.dsl.Idempotent;
 import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.NeverDefault;
 import com.oracle.truffle.api.dsl.Specialization;
@@ -1186,6 +1187,7 @@ static Object[] uncached(Object[] args, int offset,
             return output;
         }
 
+        @Idempotent
         static int effectiveLen(int len, int offset) {
             return len - offset;
         }
@@ -1238,6 +1240,7 @@ static Object[] uncached(Object[] args, int offset,
             return output;
         }
 
+        @Idempotent
         static int effectiveLen(int len, int offset) {
             return len - offset;
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/DynamicObjectNativeWrapper.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/DynamicObjectNativeWrapper.java
@@ -215,6 +215,7 @@
 import com.oracle.truffle.api.dsl.Cached.Shared;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.GenerateUncached;
+import com.oracle.truffle.api.dsl.Idempotent;
 import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.dsl.TypeSystemReference;
@@ -330,10 +331,12 @@ static Object execute(DynamicObjectNativeWrapper object, String key,
             }
         }
 
+        @Idempotent
         protected static boolean isObBase(String key) {
             return OB_BASE.getMemberNameJavaString().equals(key);
         }
 
+        @Idempotent
         protected static boolean isObRefcnt(String key) {
             return OB_REFCNT.getMemberNameJavaString().equals(key);
         }
@@ -2174,14 +2177,17 @@ static Object execute(PrimitiveNativeWrapper object, String key,
                 }
             }
 
+            @Idempotent
             protected static boolean isObBase(String key) {
                 return OB_BASE.getMemberNameJavaString().equals(key);
             }
 
+            @Idempotent
             protected static boolean isObRefcnt(String key) {
                 return OB_REFCNT.getMemberNameJavaString().equals(key);
             }
 
+            @Idempotent
             protected static boolean isObType(String key) {
                 return OB_TYPE.getMemberNameJavaString().equals(key);
             }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/NativeMember.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/NativeMember.java
@@ -49,6 +49,7 @@
 import com.oracle.graal.python.nodes.StringLiterals;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
+import com.oracle.truffle.api.dsl.Idempotent;
 import com.oracle.truffle.api.strings.TruffleString;
 
 public enum NativeMember {
@@ -358,6 +359,7 @@ public static NativeMember byName(String name) {
         return null;
     }
 
+    @Idempotent
     public static boolean isValid(String name) {
         return byName(name) != null;
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/PyLongDigitsWrapper.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/PyLongDigitsWrapper.java
@@ -53,6 +53,7 @@
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Exclusive;
 import com.oracle.truffle.api.dsl.Cached.Shared;
+import com.oracle.truffle.api.dsl.Idempotent;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.interop.InvalidArrayIndexException;
@@ -251,6 +252,7 @@ static Object doByteArrayMultiCtx(@SuppressWarnings("unused") PyLongDigitsWrappe
             return callGetTypeIDNode.call(FUN_GET_UINT32_T_ARRAY_TYPE_ID, 0);
         }
 
+        @Idempotent
         protected static boolean isSingleContext() {
             CompilerAsserts.neverPartOfCompilation();
             return PythonLanguage.get(null).isSingleContext();
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/TruffleObjectNativeWrapper.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/TruffleObjectNativeWrapper.java
@@ -54,6 +54,7 @@
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Exclusive;
+import com.oracle.truffle.api.dsl.Idempotent;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.interop.UnknownIdentifierException;
@@ -144,6 +145,7 @@ static Object execute(TruffleObjectNativeWrapper object, String key,
             }
         }
 
+        @Idempotent
         protected static boolean isObBase(String key) {
             return OB_BASE.getMemberNameJavaString().equals(key);
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode/FrameInfo.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode/FrameInfo.java
@@ -43,6 +43,7 @@
 import com.oracle.graal.python.compiler.CodeUnit;
 import com.oracle.graal.python.compiler.OpCodesConstants;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
+import com.oracle.truffle.api.dsl.Idempotent;
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.frame.FrameDescriptor;
 import com.oracle.truffle.api.strings.TruffleString;
@@ -76,6 +77,7 @@ public Object getYieldFrom(Frame generatorFrame, int bci, int stackTop) {
         return null;
     }
 
+    @Idempotent
     public int getVariableCount() {
         CodeUnit code = rootNode.getCodeUnit();
         return code.varnames.length + code.cellvars.length + code.freevars.length;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/GetFrameLocalsNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/GetFrameLocalsNode.java
@@ -52,6 +52,7 @@
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Shared;
 import com.oracle.truffle.api.dsl.GenerateUncached;
+import com.oracle.truffle.api.dsl.Idempotent;
 import com.oracle.truffle.api.dsl.NeverDefault;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.FrameDescriptor;
@@ -136,6 +137,7 @@ private static void copyItem(MaterializedFrame locals, FrameInfo info, PDict dic
             }
         }
 
+        @Idempotent
         protected static FrameInfo getInfo(FrameDescriptor fd) {
             return (FrameInfo) fd.getInfo();
         }

Original file line number	Diff line number	Diff line change
`@@ -187,6 +187,7 @@`
`187`	`187`	`import com.oracle.truffle.api.dsl.Cached.Shared;`
`188`	`188`	`import com.oracle.truffle.api.dsl.Fallback;`
`189`	`189`	`import com.oracle.truffle.api.dsl.GenerateUncached;`
	`190`	`+import com.oracle.truffle.api.dsl.Idempotent;`
`190`	`191`	`import com.oracle.truffle.api.dsl.ImportStatic;`
`191`	`192`	`import com.oracle.truffle.api.dsl.NeverDefault;`
`192`	`193`	`import com.oracle.truffle.api.dsl.Specialization;`
`@@ -1186,6 +1187,7 @@ static Object[] uncached(Object[] args, int offset,`
`1186`	`1187`	`return output;`
`1187`	`1188`	`}`
`1188`	`1189`
	`1190`	`+ @Idempotent`
`1189`	`1191`	`static int effectiveLen(int len, int offset) {`
`1190`	`1192`	`return len - offset;`
`1191`	`1193`	`}`
`@@ -1238,6 +1240,7 @@ static Object[] uncached(Object[] args, int offset,`
`1238`	`1240`	`return output;`
`1239`	`1241`	`}`
`1240`	`1242`
	`1243`	`+ @Idempotent`
`1241`	`1244`	`static int effectiveLen(int len, int offset) {`
`1242`	`1245`	`return len - offset;`
`1243`	`1246`	`}`
Original file line number	Diff line number	Diff line change
`@@ -215,6 +215,7 @@`
`215`	`215`	`import com.oracle.truffle.api.dsl.Cached.Shared;`
`216`	`216`	`import com.oracle.truffle.api.dsl.Fallback;`
`217`	`217`	`import com.oracle.truffle.api.dsl.GenerateUncached;`
	`218`	`+import com.oracle.truffle.api.dsl.Idempotent;`
`218`	`219`	`import com.oracle.truffle.api.dsl.ImportStatic;`
`219`	`220`	`import com.oracle.truffle.api.dsl.Specialization;`
`220`	`221`	`import com.oracle.truffle.api.dsl.TypeSystemReference;`
`@@ -330,10 +331,12 @@ static Object execute(DynamicObjectNativeWrapper object, String key,`
`330`	`331`	`}`
`331`	`332`	`}`
`332`	`333`
	`334`	`+ @Idempotent`
`333`	`335`	`protected static boolean isObBase(String key) {`
`334`	`336`	`return OB_BASE.getMemberNameJavaString().equals(key);`
`335`	`337`	`}`
`336`	`338`
	`339`	`+ @Idempotent`
`337`	`340`	`protected static boolean isObRefcnt(String key) {`
`338`	`341`	`return OB_REFCNT.getMemberNameJavaString().equals(key);`
`339`	`342`	`}`
`@@ -2174,14 +2177,17 @@ static Object execute(PrimitiveNativeWrapper object, String key,`
`2174`	`2177`	`}`
`2175`	`2178`	`}`
`2176`	`2179`
	`2180`	`+ @Idempotent`
`2177`	`2181`	`protected static boolean isObBase(String key) {`
`2178`	`2182`	`return OB_BASE.getMemberNameJavaString().equals(key);`
`2179`	`2183`	`}`
`2180`	`2184`
	`2185`	`+ @Idempotent`
`2181`	`2186`	`protected static boolean isObRefcnt(String key) {`
`2182`	`2187`	`return OB_REFCNT.getMemberNameJavaString().equals(key);`
`2183`	`2188`	`}`
`2184`	`2189`
	`2190`	`+ @Idempotent`
`2185`	`2191`	`protected static boolean isObType(String key) {`
`2186`	`2192`	`return OB_TYPE.getMemberNameJavaString().equals(key);`
`2187`	`2193`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@`
`49`	`49`	`import com.oracle.graal.python.nodes.StringLiterals;`
`50`	`50`	`import com.oracle.truffle.api.CompilerDirectives;`
`51`	`51`	`import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;`
	`52`	`+import com.oracle.truffle.api.dsl.Idempotent;`
`52`	`53`	`import com.oracle.truffle.api.strings.TruffleString;`
`53`	`54`
`54`	`55`	`public enum NativeMember {`
`@@ -358,6 +359,7 @@ public static NativeMember byName(String name) {`
`358`	`359`	`return null;`
`359`	`360`	`}`
`360`	`361`
	`362`	`+ @Idempotent`
`361`	`363`	`public static boolean isValid(String name) {`
`362`	`364`	`return byName(name) != null;`
`363`	`365`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@`
`54`	`54`	`import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;`
`55`	`55`	`import com.oracle.truffle.api.dsl.Cached;`
`56`	`56`	`import com.oracle.truffle.api.dsl.Cached.Exclusive;`
	`57`	`+import com.oracle.truffle.api.dsl.Idempotent;`
`57`	`58`	`import com.oracle.truffle.api.dsl.Specialization;`
`58`	`59`	`import com.oracle.truffle.api.interop.InteropLibrary;`
`59`	`60`	`import com.oracle.truffle.api.interop.UnknownIdentifierException;`
`@@ -144,6 +145,7 @@ static Object execute(TruffleObjectNativeWrapper object, String key,`
`144`	`145`	`}`
`145`	`146`	`}`
`146`	`147`
	`148`	`+ @Idempotent`
`147`	`149`	`protected static boolean isObBase(String key) {`
`148`	`150`	`return OB_BASE.getMemberNameJavaString().equals(key);`
`149`	`151`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@`
`52`	`52`	`import com.oracle.truffle.api.dsl.Cached;`
`53`	`53`	`import com.oracle.truffle.api.dsl.Cached.Shared;`
`54`	`54`	`import com.oracle.truffle.api.dsl.GenerateUncached;`
	`55`	`+import com.oracle.truffle.api.dsl.Idempotent;`
`55`	`56`	`import com.oracle.truffle.api.dsl.NeverDefault;`
`56`	`57`	`import com.oracle.truffle.api.dsl.Specialization;`
`57`	`58`	`import com.oracle.truffle.api.frame.FrameDescriptor;`
`@@ -136,6 +137,7 @@ private static void copyItem(MaterializedFrame locals, FrameInfo info, PDict dic`
`136`	`137`	`}`
`137`	`138`	`}`
`138`	`139`
	`140`	`+ @Idempotent`
`139`	`141`	`protected static FrameInfo getInfo(FrameDescriptor fd) {`
`140`	`142`	`return (FrameInfo) fd.getInfo();`
`141`	`143`	`}`