Thread-safety fixes

msimacek · msimacek · commit 750d3616b2bb · 2020-02-13T16:21:51.000+01:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java
@@ -1610,7 +1610,7 @@ public Object doIt(VirtualFrame frame, Object[] args, PKeyword[] kwargs) {
                 // we already have a Truffle debugger attached, it'll stop here
                 return PNone.NONE;
             } else if (getContext().isInitialized()) {
-                if (getSysModuleNode == null) {
+                if (callNode == null) {
                     CompilerDirectives.transferToInterpreterAndInvalidate();
                     getSysModuleNode = insert(HashingStorageNodes.GetItemNode.create());
                     getBreakpointhookNode = insert(ReadAttributeFromObjectNode.create());
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/MarshalModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/MarshalModuleBuiltins.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -245,8 +245,10 @@ abstract static class MarshallerNode extends PNodeWithState {
         protected MarshallerNode getRecursiveNode() {
             if (recursiveNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                recursiveNode = insert(create());
-                recursiveNode.depth += 1;
+                synchronized (this) {
+                    recursiveNode = insert(create());
+                    recursiveNode.depth += 1;
+                }
             }
             return recursiveNode;
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/MathModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/MathModuleBuiltins.java
@@ -878,7 +878,7 @@ public boolean isClose(long a, long b, double rel_tol, double abs_tol) {
 
         @Fallback
         public boolean isClose(VirtualFrame frame, Object a, Object b, Object rel_tol, Object abs_tol) {
-            if (castANode == null) {
+            if (castAbsNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
                 castANode = insert(CastToDoubleNode.create());
                 castBNode = insert(CastToDoubleNode.create());
@@ -989,7 +989,7 @@ public double ldexpPIL(PInt mantissa, long exp) {
         @Fallback
         public double ldexpOO(VirtualFrame frame, Object mantissa, Object exp) {
             if (PGuards.isInteger(exp) || PGuards.isPInt(exp) || (exp instanceof Boolean)) {
-                if (castNode == null) {
+                if (recursiveNode == null) {
                     CompilerDirectives.transferToInterpreterAndInvalidate();
                     castNode = insert(CastToDoubleNode.create());
                     recursiveNode = insert(LdexpNode.create());
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, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -397,7 +397,7 @@ public Object get(SuperObject self, Object obj, @SuppressWarnings("unused") Obje
                 // not binding to an object or already bound
                 return this;
             } else {
-                if (superInit == null) {
+                if (getType == null) {
                     CompilerDirectives.transferToInterpreterAndInvalidate();
                     superInit = insert(SuperInitNodeFactory.create());
                     getType = insert(GetTypeNodeGen.create());
@@ -483,7 +483,7 @@ public Object get(VirtualFrame frame, SuperObject self, Object attr) {
                          * Only pass 'obj' param if this is instance-mode super (See SF ID #743627)
                          */
                         // acts as a branch profile
-                        if (getObject == null) {
+                        if (callGet == null) {
                             CompilerDirectives.transferToInterpreterAndInvalidate();
                             getObject = insert(GetObjectNodeGen.create());
                             callGet = insert(CallTernaryMethodNode.create());
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/zipimporter/ZipImporterBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/zipimporter/ZipImporterBuiltins.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -357,10 +357,9 @@ public PNone init(VirtualFrame frame, PZipImporter self, PBytes path,
         @Specialization
         public PNone init(VirtualFrame frame, PZipImporter self, PythonObject path) {
             // at first we need to find out, whether path object has __fspath__ method
-            if (getClassNode == null) {
+            if (findFspathNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
                 getClassNode = insert(GetLazyClassNode.create());
-                CompilerDirectives.transferToInterpreterAndInvalidate();
                 findFspathNode = insert(LookupAttributeInMRONode.create(SpecialMethodNames.__FSPATH__));
             }
             Object result = findFspathNode.execute(getClassNode.execute(path));
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/control/ForNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/control/ForNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -184,8 +184,15 @@ public StatementNode getBody() {
     public void executeVoid(VirtualFrame frame) {
         if (iteratorSlot == null) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
-            iteratorSlot = frame.getFrameDescriptor().addFrameSlot(new Object(), FrameSlotKind.Object);
-            ((ForRepeatingNode) loopNode.getRepeatingNode()).iteratorSlot = iteratorSlot;
+            getLock().lock();
+            try {
+                if (iteratorSlot == null) {
+                    iteratorSlot = frame.getFrameDescriptor().addFrameSlot(new Object(), FrameSlotKind.Object);
+                    ((ForRepeatingNode) loopNode.getRepeatingNode()).iteratorSlot = iteratorSlot;
+                }
+            } finally {
+                getLock().unlock();
+            }
         }
         frame.setObject(iteratorSlot, iterator.execute(frame));
         try {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/generator/GeneratorAccessNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/generator/GeneratorAccessNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates.
  * Copyright (c) 2014, Regents of the University of California
  *
  * All rights reserved.
@@ -65,10 +65,14 @@ private GeneratorControlData getControlData(VirtualFrame frame) {
     public boolean isActive(VirtualFrame frame, int flagSlot) {
         if (active.length <= flagSlot) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
-            byte[] newActive = new byte[flagSlot + 1];
-            Arrays.fill(newActive, UNSET);
-            System.arraycopy(active, 0, newActive, 0, active.length);
-            active = newActive;
+            synchronized (this) {
+                if (active.length <= flagSlot) {
+                    byte[] newActive = new byte[flagSlot + 1];
+                    Arrays.fill(newActive, UNSET);
+                    System.arraycopy(active, 0, newActive, 0, active.length);
+                    active = newActive;
+                }
+            }
         }
         if (active[flagSlot] == UNSET) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
@@ -94,10 +98,14 @@ public void setActive(VirtualFrame frame, int flagSlot, boolean value) {
     public int getIndex(VirtualFrame frame, int blockIndexSlot) {
         if (indices.length <= blockIndexSlot) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
-            int[] newIndices = new int[blockIndexSlot + 1];
-            Arrays.fill(newIndices, UNSET);
-            System.arraycopy(indices, 0, newIndices, 0, indices.length);
-            indices = newIndices;
+            synchronized (this) {
+                if (indices.length <= blockIndexSlot) {
+                    int[] newIndices = new int[blockIndexSlot + 1];
+                    Arrays.fill(newIndices, UNSET);
+                    System.arraycopy(indices, 0, newIndices, 0, indices.length);
+                    indices = newIndices;
+                }
+            }
         }
         if (indices[blockIndexSlot] == UNSET) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/AssertNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/AssertNode.java
@@ -66,8 +66,8 @@ public void executeVoid(VirtualFrame frame) {
         if (assertionsEnabled == null) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
             PythonContext context = getContext();
-            assertionsEnabled = !PythonOptions.getOption(context, PythonOptions.PythonOptimizeFlag);
             javaExceptionsFailAssertions = PythonOptions.getOption(context, PythonOptions.CatchAllExceptions);
+            assertionsEnabled = !PythonOptions.getOption(context, PythonOptions.PythonOptimizeFlag);
         }
         if (assertionsEnabled) {
             try {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/ImportFromNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/ImportFromNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -119,7 +119,7 @@ public void executeVoid(VirtualFrame frame) {
                         throw pe;
                     }
                     String fullname = pkgname + "." + attr;
-                    if (getItem == null) {
+                    if (readModules == null) {
                         CompilerDirectives.transferToInterpreterAndInvalidate();
                         getItem = insert(GetItemNode.create());
                         readModules = insert(ReadAttributeFromObjectNode.create());

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2017, 2019, Oracle and/or its affiliates.`
	`2`	`+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates.`
`3`	`3`	`* Copyright (c) 2013, Regents of the University of California`
`4`	`4`	`*`
`5`	`5`	`* All rights reserved.`
`@@ -245,8 +245,10 @@ abstract static class MarshallerNode extends PNodeWithState {`
`245`	`245`	`protected MarshallerNode getRecursiveNode() {`
`246`	`246`	`if (recursiveNode == null) {`
`247`	`247`	`CompilerDirectives.transferToInterpreterAndInvalidate();`
`248`		`- recursiveNode = insert(create());`
`249`		`- recursiveNode.depth += 1;`
	`248`	`+ synchronized (this) {`
	`249`	`+ recursiveNode = insert(create());`
	`250`	`+ recursiveNode.depth += 1;`
	`251`	`+ }`
`250`	`252`	`}`
`251`	`253`	`return recursiveNode;`
`252`	`254`	`}`