LLVM: fix race condition when initializing LLVMLanguage#activeConfigu…

…ration
CAFxX · May 14, 2021 · 4f9bc93 · 4f9bc93
1 parent a5ca5bd
commit 4f9bc93
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/...cts/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/LLVMLanguage.java b/...cts/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/LLVMLanguage.java
@@ -280,6 +280,16 @@ public boolean containsLibrarySource(String path) {
 
     @Override
     protected LLVMContext createContext(Env env) {
+        ensureActiveConfiguration(env);
+
+        Toolchain toolchain = new ToolchainImpl(activeConfiguration.getCapability(ToolchainConfig.class), this);
+        env.registerService(toolchain);
+
+        LLVMContext context = new LLVMContext(this, env, toolchain);
+        return context;
+    }
+
+    private synchronized void ensureActiveConfiguration(Env env) {
         if (activeConfiguration == null) {
             final ArrayList<ContextExtension.Key<?>> ctxExts = new ArrayList<>();
             ContextExtension.Registry r = new ContextExtension.Registry() {
@@ -300,12 +310,6 @@ public <C extends ContextExtension> ContextExtension.Key<C> register(Class<C> ty
             cachedLLVMMemory = activeConfiguration.getCapability(LLVMMemory.class);
             contextExtensions = ctxExts.toArray(ContextExtensionKey.EMPTY);
         }
-
-        Toolchain toolchain = new ToolchainImpl(activeConfiguration.getCapability(ToolchainConfig.class), this);
-        env.registerService(toolchain);
-
-        LLVMContext context = new LLVMContext(this, env, toolchain);
-        return context;
     }
 
     /**