[GR-31457] Invalid assumption in LLVMContext.getSymbol.

PullRequest: graal/8982
oracle · May 20, 2021 · 3ec3ea3 · 3ec3ea3
2 parents aa2f6e8 + 87849e2
commit 3ec3ea3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 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.
  *
@@ -60,10 +60,10 @@ public abstract class AggregateLiteralInPlaceNode extends LLVMStatementNode {
     private static final ByteArraySupport byteSupport = ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN ? ByteArraySupport.bigEndian() : ByteArraySupport.littleEndian();
 
     /**
-     * This node initializes a block of memory with a with combination of raw bytes and explicit
-     * store nodes. When executed, it transfers all bytes from {@code data} to the target (using i8
-     * and i64 stores as appropriate), except for those covered by a node in {@code stores}. Every
-     * store node has a corresponding entry in {@code offsets} and {@sizes}.
+     * This node initializes a block of memory with a combination of raw bytes and explicit store
+     * nodes. When executed, it transfers all bytes from {@code data} to the target (using i8 and
+     * i64 stores as appropriate), except for those covered by a node in {@code stores}. Every store
+     * node has a corresponding entry in {@code offsets} and {@sizes}.
      */
     public AggregateLiteralInPlaceNode(byte[] data, LLVMOffsetStoreNode[] stores, int[] offsets, int[] sizes, int[] bufferOffsets, LLVMGlobal[] descriptors) {
         assert offsets.length == stores.length + 1 && stores.length == sizes.length;