Sulong: amend LLVMContext.getSymbol to check for constant "symbol"

oracle · May 20, 2021 · 87849e2 · 87849e2
1 parent 3e90988
commit 87849e2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/...ects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/LLVMContext.java b/...ects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/LLVMContext.java
@@ -665,7 +665,7 @@ public LLVMPointer getSymbol(LLVMSymbol symbol) {
         BitcodeID bitcodeID = symbol.getBitcodeID(false);
         int id = bitcodeID.getId();
         int index = symbol.getSymbolIndex(false);
-        if (CompilerDirectives.inCompiledCode() && CompilerDirectives.isPartialEvaluationConstant(this)) {
+        if (CompilerDirectives.inCompiledCode() && CompilerDirectives.isPartialEvaluationConstant(this) && CompilerDirectives.isPartialEvaluationConstant(symbol)) {
             if (!symbolAssumptions[id][index].isValid()) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
             }

diff --git a/...m.runtime/src/com/oracle/truffle/llvm/runtime/nodes/vars/AggregateLiteralInPlaceNode.java b/...m.runtime/src/com/oracle/truffle/llvm/runtime/nodes/vars/AggregateLiteralInPlaceNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2020, Oracle and/or its affiliates.
+ * Copyright (c) 2016, 2021, Oracle and/or its affiliates.
  *
  * All rights reserved.
  *
@@ -86,7 +86,6 @@ protected void initialize(VirtualFrame frame,
         writeObjects(frame, context);
     }
 
-    @ExplodeLoop
     private void writePrimitives(LLVMContext context, LLVMI8OffsetStoreNode storeI8, LLVMI64OffsetStoreNode storeI64) {
         int offset = 0;
         int nextStore = 0;