[GR-29543] Fix race conditions when contexts share an engine

msimacek · msimacek · commit ab7bffe1aa58 · 2021-03-05T14:21:55.000Z
PullRequest: graalpython/1635
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/builtins/PythonBinaryClinicBuiltinNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/builtins/PythonBinaryClinicBuiltinNode.java
@@ -68,15 +68,18 @@ private Object cast(ArgumentClinicProvider clinic, VirtualFrame frame, int argIn
     }
 
     protected Object castWithNode(ArgumentClinicProvider clinic, VirtualFrame frame, int argIndex, Object value) {
+        ArgumentCastNode castNode;
         if (castNodes == null) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
             castNodes = new ArgumentCastNode[2];
         }
-        if (castNodes[argIndex] == null) {
+        castNode = castNodes[argIndex];
+        if (castNode == null) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
-            castNodes[argIndex] = insert(clinic.createCastNode(argIndex, this));
+            castNode = insert(clinic.createCastNode(argIndex, this));
+            castNodes[argIndex] = castNode;
         }
-        return castNodes[argIndex].execute(frame, value);
+        return castNode.execute(frame, value);
     }
 
     @Override
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/builtins/PythonQuaternaryClinicBuiltinNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/builtins/PythonQuaternaryClinicBuiltinNode.java
@@ -66,15 +66,18 @@ private Object cast(ArgumentClinicProvider clinic, VirtualFrame frame, int argIn
     }
 
     protected Object castWithNode(ArgumentClinicProvider clinic, VirtualFrame frame, int argIndex, Object value) {
+        ArgumentCastNode castNode;
         if (castNodes == null) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
             castNodes = new ArgumentCastNode[4];
         }
-        if (castNodes[argIndex] == null) {
+        castNode = castNodes[argIndex];
+        if (castNode == null) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
-            castNodes[argIndex] = insert(clinic.createCastNode(argIndex, this));
+            castNode = insert(clinic.createCastNode(argIndex, this));
+            castNodes[argIndex] = castNode;
         }
-        return castNodes[argIndex].execute(frame, value);
+        return castNode.execute(frame, value);
     }
 
     @Override
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/builtins/PythonTernaryClinicBuiltinNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/builtins/PythonTernaryClinicBuiltinNode.java
@@ -66,15 +66,18 @@ private Object cast(ArgumentClinicProvider clinic, VirtualFrame frame, int argIn
     }
 
     protected Object castWithNode(ArgumentClinicProvider clinic, VirtualFrame frame, int argIndex, Object value) {
+        ArgumentCastNode castNode;
         if (castNodes == null) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
             castNodes = new ArgumentCastNode[3];
         }
-        if (castNodes[argIndex] == null) {
+        castNode = castNodes[argIndex];
+        if (castNode == null) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
-            castNodes[argIndex] = insert(clinic.createCastNode(argIndex, this));
+            castNode = insert(clinic.createCastNode(argIndex, this));
+            castNodes[argIndex] = castNode;
         }
-        return castNodes[argIndex].execute(frame, value);
+        return castNode.execute(frame, value);
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -68,15 +68,18 @@ private Object cast(ArgumentClinicProvider clinic, VirtualFrame frame, int argIn`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`protected Object castWithNode(ArgumentClinicProvider clinic, VirtualFrame frame, int argIndex, Object value) {`
	`71`	`+ ArgumentCastNode castNode;`
`71`	`72`	`if (castNodes == null) {`
`72`	`73`	`CompilerDirectives.transferToInterpreterAndInvalidate();`
`73`	`74`	`castNodes = new ArgumentCastNode[2];`
`74`	`75`	`}`
`75`		`- if (castNodes[argIndex] == null) {`
	`76`	`+ castNode = castNodes[argIndex];`
	`77`	`+ if (castNode == null) {`
`76`	`78`	`CompilerDirectives.transferToInterpreterAndInvalidate();`
`77`		`- castNodes[argIndex] = insert(clinic.createCastNode(argIndex, this));`
	`79`	`+ castNode = insert(clinic.createCastNode(argIndex, this));`
	`80`	`+ castNodes[argIndex] = castNode;`
`78`	`81`	`}`
`79`		`- return castNodes[argIndex].execute(frame, value);`
	`82`	`+ return castNode.execute(frame, value);`
`80`	`83`	`}`
`81`	`84`
`82`	`85`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -66,15 +66,18 @@ private Object cast(ArgumentClinicProvider clinic, VirtualFrame frame, int argIn`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`protected Object castWithNode(ArgumentClinicProvider clinic, VirtualFrame frame, int argIndex, Object value) {`
	`69`	`+ ArgumentCastNode castNode;`
`69`	`70`	`if (castNodes == null) {`
`70`	`71`	`CompilerDirectives.transferToInterpreterAndInvalidate();`
`71`	`72`	`castNodes = new ArgumentCastNode[4];`
`72`	`73`	`}`
`73`		`- if (castNodes[argIndex] == null) {`
	`74`	`+ castNode = castNodes[argIndex];`
	`75`	`+ if (castNode == null) {`
`74`	`76`	`CompilerDirectives.transferToInterpreterAndInvalidate();`
`75`		`- castNodes[argIndex] = insert(clinic.createCastNode(argIndex, this));`
	`77`	`+ castNode = insert(clinic.createCastNode(argIndex, this));`
	`78`	`+ castNodes[argIndex] = castNode;`
`76`	`79`	`}`
`77`		`- return castNodes[argIndex].execute(frame, value);`
	`80`	`+ return castNode.execute(frame, value);`
`78`	`81`	`}`
`79`	`82`
`80`	`83`	`@Override`