Fix: invalid sharing of PythonObjectLibrary instance

Author: fangerer

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/exception/PBaseException.java

@@ -61,7 +61,6 @@
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 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.CachedLanguage;
 import com.oracle.truffle.api.interop.ExceptionType;
@@ -198,17 +197,12 @@ public Object[] getMessageArgs() {
     }
 
     @TruffleBoundary
-    public String getFormattedMessage(PythonObjectLibrary lib) {
-        final Object clazz;
-        if (lib == null) {
-            clazz = PythonObjectLibrary.getUncached().getLazyPythonClass(this);
-        } else {
-            clazz = lib.getLazyPythonClass(this);
-        }
+    public String getFormattedMessage(PythonObjectLibrary baseExceptionLib, PythonObjectLibrary argsLib) {
+        final Object clazz = baseExceptionLib.getLazyPythonClass(this);
         String typeName = GetNameNode.doSlowPath(clazz);
         if (args == null) {
             if (messageArgs != null && messageArgs.length > 0) {
-                return typeName + ": " + FORMATTER.format(lib, messageFormat, getMessageArgs());
+                return typeName + ": " + FORMATTER.format(argsLib, messageFormat, getMessageArgs());
             } else if (hasMessageFormat) {
                 return typeName + ": " + messageFormat;
             } else {
@@ -287,7 +281,8 @@ boolean isException() {
     @ExportMessage
     RuntimeException throwException(
                     @Cached PRaiseNode raiseNode,
-                    @CachedLanguage PythonLanguage language, @Exclusive @Cached GilNode gil) {
+                    @CachedLanguage PythonLanguage language,
+                    @Shared("gil") @Cached GilNode gil) {
         boolean mustRelease = gil.acquire();
         try {
             throw raiseNode.raiseExceptionObject(this, language);
@@ -298,7 +293,8 @@ RuntimeException throwException(
 
     @ExportMessage
     ExceptionType getExceptionType(
-                    @CachedLibrary("this") PythonObjectLibrary lib, @Exclusive @Cached GilNode gil) {
+                    @CachedLibrary("this") PythonObjectLibrary lib,
+                    @Shared("gil") @Cached GilNode gil) {
         boolean mustRelease = gil.acquire();
         try {
             Object clazz = lib.getLazyPythonClass(this);
@@ -332,10 +328,12 @@ boolean hasExceptionMessage() {
     }
 
     @ExportMessage
-    String getExceptionMessage(@CachedLibrary("this") PythonObjectLibrary lib, @Exclusive @Cached GilNode gil) {
+    String getExceptionMessage(@CachedLibrary("this") PythonObjectLibrary lib,
+                    @CachedLibrary(limit = "3") PythonObjectLibrary argsLib,
+                    @Shared("gil") @Cached GilNode gil) {
         boolean mustRelease = gil.acquire();
         try {
-            return getFormattedMessage(lib);
+            return getFormattedMessage(lib, argsLib);
         } finally {
             gil.release(mustRelease);
         }
@@ -345,7 +343,8 @@ String getExceptionMessage(@CachedLibrary("this") PythonObjectLibrary lib, @Excl
     int getExceptionExitStatus(
                     @CachedLibrary(limit = "2") PythonObjectLibrary lib,
                     @Cached ReadAttributeFromDynamicObjectNode readNode,
-                    @Shared("unsupportedProfile") @Cached BranchProfile unsupportedProfile, @Exclusive @Cached GilNode gil) throws UnsupportedMessageException {
+                    @Shared("unsupportedProfile") @Cached BranchProfile unsupportedProfile,
+                    @Shared("gil") @Cached GilNode gil) throws UnsupportedMessageException {
         boolean mustRelease = gil.acquire();
         try {
             if (getExceptionType(lib, gil) == ExceptionType.EXIT) {
@@ -368,7 +367,7 @@ int getExceptionExitStatus(
     }
 
     @ExportMessage
-    boolean hasExceptionCause(@Exclusive @Cached GilNode gil) {
+    boolean hasExceptionCause(@Shared("gil") @Cached GilNode gil) {
         boolean mustRelease = gil.acquire();
         try {
             return cause != null || (!suppressContext && context != null);
@@ -379,7 +378,8 @@ boolean hasExceptionCause(@Exclusive @Cached GilNode gil) {
 
     @ExportMessage
     Object getExceptionCause(
-                    @Shared("unsupportedProfile") @Cached BranchProfile unsupportedProfile, @Exclusive @Cached GilNode gil) throws UnsupportedMessageException {
+                    @Shared("unsupportedProfile") @Cached BranchProfile unsupportedProfile,
+                    @Shared("gil") @Cached GilNode gil) throws UnsupportedMessageException {
         boolean mustRelease = gil.acquire();
         try {
             if (cause != null) {