[GR-58596] Fix duplicate class definition attempts for generated type…

…-mapped proxies. PullRequest: graal/18929
oracle · Oct 2, 2024 · 4daeafd · 4daeafd
2 parents edc1423 + 2e336c3
commit 4daeafd
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/....truffle.espresso/src/com/oracle/truffle/espresso/nodes/interop/LookupProxyKlassNode.java b/....truffle.espresso/src/com/oracle/truffle/espresso/nodes/interop/LookupProxyKlassNode.java
@@ -100,14 +100,21 @@ private static Klass lookupOrDefineInBindingsLoader(EspressoForeignProxyGenerato
 
         Symbol<Symbol.Type> proxyName = context.getTypes().fromClassGetName(proxyBytes.name);
         Klass proxyKlass = registry.findLoadedKlass(context.getClassLoadingEnv(), proxyName);
-        if (proxyKlass == null) {
-            try {
-                proxyKlass = registry.defineKlass(context, proxyName, proxyBytes.bytes);
-            } catch (EspressoClassLoadingException e) {
-                throw EspressoError.shouldNotReachHere(e);
+        if (proxyKlass != null) {
+            return proxyKlass;
+        }
+        // double-checked locking on the proxy name
+        synchronized (proxyName) {
+            proxyKlass = registry.findLoadedKlass(context.getClassLoadingEnv(), proxyName);
+            if (proxyKlass == null) {
+                try {
+                    proxyKlass = registry.defineKlass(context, proxyName, proxyBytes.bytes);
+                } catch (EspressoClassLoadingException e) {
+                    throw EspressoError.shouldNotReachHere(e);
+                }
             }
+            return proxyKlass;
         }
-        return proxyKlass;
     }
 
     private static ObjectKlass fillParents(Object metaObject, InteropLibrary interop, PolyglotTypeMappings mappings, Set<ObjectKlass> parents, EspressoContext context) throws ClassCastException {