[GR-35569] Fixing compilation of LoadModulesNode failing.

PullRequest: graal/10560

Author: Palez

sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/LLVMAlias.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates.
  *
  * All rights reserved.
  *
@@ -29,33 +29,25 @@
  */
 package com.oracle.truffle.llvm.runtime;
 
-import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
-import com.oracle.truffle.llvm.runtime.except.LLVMLinkerException;
 import com.oracle.truffle.llvm.runtime.global.LLVMGlobal;
-import org.graalvm.collections.EconomicSet;
-import org.graalvm.collections.Equivalence;
 
 public class LLVMAlias extends LLVMSymbol {
 
-    @CompilationFinal private LLVMSymbol target;
+    private final LLVMSymbol target;
 
     public LLVMAlias(String name, LLVMSymbol target, boolean exported) {
         super(name, IDGenerater.INVALID_ID, LLVMSymbol.INVALID_INDEX, exported, false);
-        setTarget(target);
+        if (target instanceof LLVMAlias) {
+            this.target = ((LLVMAlias) target).getTarget();
+        } else {
+            this.target = target;
+        }
     }
 
     public LLVMSymbol getTarget() {
         return target;
     }
 
-    public void setTarget(LLVMSymbol value) {
-        this.target = value;
-        if (target instanceof LLVMAlias) {
-            EconomicSet<LLVMAlias> visited = EconomicSet.create(Equivalence.IDENTITY);
-            checkForCycle(this, visited);
-        }
-    }
-
     @Override
     public boolean isFunction() {
         return target.isFunction();
@@ -86,25 +78,11 @@ public String toString() {
         return super.getName() + " -> " + target.toString();
     }
 
-    private void checkForCycle(LLVMAlias alias, EconomicSet<LLVMAlias> visited) {
-        if (visited.contains(alias)) {
-            throw new LLVMLinkerException("Found a cycle between the following aliases: " + visited.toString());
-        }
-        visited.add(alias);
-        if (alias.getTarget() instanceof LLVMAlias) {
-            checkForCycle((LLVMAlias) alias.getTarget(), visited);
-        }
-    }
-
     public static LLVMSymbol resolveAlias(LLVMSymbol symbol) {
-        if (symbol == null) {
-            return null;
-        }
-        LLVMSymbol tmp = symbol;
-        while (tmp.isAlias()) {
-            tmp = ((LLVMAlias) tmp).getTarget();
+        if (symbol.isAlias()) {
+            return ((LLVMAlias) symbol).getTarget();
         }
-        return tmp;
+        return symbol;
     }
 
     @Override

sulong/projects/com.oracle.truffle.llvm/src/com/oracle/truffle/llvm/initialization/InitializeOverwriteNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+ * Copyright (c) 2020, 2022, Oracle and/or its affiliates.
  *
  * All rights reserved.
  *
@@ -30,6 +30,7 @@
 package com.oracle.truffle.llvm.initialization;
 
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
+import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.llvm.initialization.AllocExternalSymbolNodeFactory.AllocExistingLocalSymbolsNodeGen;
 import com.oracle.truffle.llvm.initialization.AllocExternalSymbolNodeFactory.AllocExistingLocalSymbolsNodeGen.AllocExistingGlobalSymbolsNodeGen.AllocExternalGlobalNodeGen;
 import com.oracle.truffle.llvm.parser.LLVMParserResult;
@@ -101,6 +102,7 @@ public InitializeOverwriteNode(LLVMParserResult result) {
         this.allocExternalSymbols = allocExternaSymbolsList.toArray(AllocExternalSymbolNode.EMPTY);
     }
 
+    @ExplodeLoop
     public void execute(LLVMContext context, LLVMScopeChain localScope, RTLDFlags rtldFlags) {
         LLVMScopeChain globalScope = context.getGlobalScopeChain();
         for (int i = 0; i < allocExternalSymbols.length; i++) {

sulong/projects/com.oracle.truffle.llvm/src/com/oracle/truffle/llvm/initialization/LoadDependencyNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates.
+ * Copyright (c) 2022, Oracle and/or its affiliates.
  *
  * All rights reserved.
  *
@@ -78,8 +78,6 @@ public CallTarget execute() {
                 return calls;
             } else {
                 Object sourceOrCallTarget = createDependencySource(libraryName, libraryName, file);
-                // A source is null if it's a native library, which will be added to the NFI
-                // context extension instead.
                 if (sourceOrCallTarget instanceof Source) {
                     return getContext().getEnv().parseInternal((Source) sourceOrCallTarget);
                 } else if (sourceOrCallTarget instanceof CallTarget) {