Add ReadPointerNode.getUncached

msimacek · msimacek · commit 40030ac16ac7 · 2024-04-19T10:43:12.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/transitions/CApiTransitions.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/transitions/CApiTransitions.java
@@ -380,8 +380,8 @@ public static void pollReferenceQueue() {
                     threadState.clearCurrentException();
                     Object nativeThreadState = PThreadState.getNativeThreadState(threadState);
                     if (nativeThreadState != null) {
-                        savedNativeException = CStructAccess.ReadPointerNode.getUncached().read(nativeThreadState, CFields.PyThreadState__curexc_type);
-                        CStructAccess.WritePointerNode.getUncached().write(nativeThreadState, CFields.PyThreadState__curexc_type, 0L);
+                        savedNativeException = CStructAccess.ReadPointerNode.readUncached(nativeThreadState, CFields.PyThreadState__curexc_type);
+                        CStructAccess.WritePointerNode.writeUncached(nativeThreadState, CFields.PyThreadState__curexc_type, 0L);
                     }
                 }
                 try {
@@ -449,7 +449,7 @@ public static void pollReferenceQueue() {
                         threadState.setCurrentException(savedException, savedTraceback);
                         Object nativeThreadState = PThreadState.getNativeThreadState(threadState);
                         if (nativeThreadState != null) {
-                            CStructAccess.WritePointerNode.getUncached().write(nativeThreadState, CFields.PyThreadState__curexc_type, savedNativeException);
+                            CStructAccess.WritePointerNode.writeUncached(nativeThreadState, CFields.PyThreadState__curexc_type, savedNativeException);
                         }
                     }
                 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/structs/CStructAccess.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/structs/CStructAccess.java
@@ -677,6 +677,10 @@ public final Object read(Object pointer, CFields field) {
             return execute(pointer, field.offset());
         }
 
+        public static Object readUncached(Object pointer, CFields field) {
+            return getUncached().read(pointer, field);
+        }
+
         public final Object readFromObj(PythonNativeObject self, CFields field) {
             return read(self.getPtr(), field);
         }

Original file line number	Diff line number	Diff line change
`@@ -380,8 +380,8 @@ public static void pollReferenceQueue() {`
`380`	`380`	`threadState.clearCurrentException();`
`381`	`381`	`Object nativeThreadState = PThreadState.getNativeThreadState(threadState);`
`382`	`382`	`if (nativeThreadState != null) {`
`383`		`- savedNativeException = CStructAccess.ReadPointerNode.getUncached().read(nativeThreadState, CFields.PyThreadState__curexc_type);`
`384`		`- CStructAccess.WritePointerNode.getUncached().write(nativeThreadState, CFields.PyThreadState__curexc_type, 0L);`
	`383`	`+ savedNativeException = CStructAccess.ReadPointerNode.readUncached(nativeThreadState, CFields.PyThreadState__curexc_type);`
	`384`	`+ CStructAccess.WritePointerNode.writeUncached(nativeThreadState, CFields.PyThreadState__curexc_type, 0L);`
`385`	`385`	`}`
`386`	`386`	`}`
`387`	`387`	`try {`
`@@ -449,7 +449,7 @@ public static void pollReferenceQueue() {`
`449`	`449`	`threadState.setCurrentException(savedException, savedTraceback);`
`450`	`450`	`Object nativeThreadState = PThreadState.getNativeThreadState(threadState);`
`451`	`451`	`if (nativeThreadState != null) {`
`452`		`- CStructAccess.WritePointerNode.getUncached().write(nativeThreadState, CFields.PyThreadState__curexc_type, savedNativeException);`
	`452`	`+ CStructAccess.WritePointerNode.writeUncached(nativeThreadState, CFields.PyThreadState__curexc_type, savedNativeException);`
`453`	`453`	`}`
`454`	`454`	`}`
`455`	`455`	`}`
Original file line number	Diff line number	Diff line change
`@@ -677,6 +677,10 @@ public final Object read(Object pointer, CFields field) {`
`677`	`677`	`return execute(pointer, field.offset());`
`678`	`678`	`}`
`679`	`679`
	`680`	`+ public static Object readUncached(Object pointer, CFields field) {`
	`681`	`+ return getUncached().read(pointer, field);`
	`682`	`+ }`
	`683`	`+`
`680`	`684`	`public final Object readFromObj(PythonNativeObject self, CFields field) {`
`681`	`685`	`return read(self.getPtr(), field);`
`682`	`686`	`}`