[GR-21590] Fix problems running the ECJ produced build.

PullRequest: graal/5631
rkennke · Mar 6, 2020 · 74bb535 · 74bb535
2 parents 7fac483 + 5a107da
commit 74bb535
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/...m.oracle.truffle.llvm.parser/src/com/oracle/truffle/llvm/parser/LLVMLivenessAnalysis.java b/...m.oracle.truffle.llvm.parser/src/com/oracle/truffle/llvm/parser/LLVMLivenessAnalysis.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates.
  *
  * All rights reserved.
  *
@@ -202,8 +202,8 @@ private static int iterateToFixedPoint(List<InstructionBlock> blocks, int frameS
         return processedBlocks;
     }
 
+    @SuppressWarnings("unchecked")
     private LLVMLivenessAnalysisResult computeLivenessAnalysisResult(List<InstructionBlock> blocks, BlockInfo[] blockInfos, ArrayList<InstructionBlock>[] predecessors) {
-        @SuppressWarnings("unchecked")
         ArrayList<NullerInformation>[] nullableWithinBlock = new ArrayList[blocks.size()];
         BitSet[] nullableBeforeBlock = new BitSet[blocks.size()];
         BitSet[] nullableAfterBlock = new BitSet[blocks.size()];
@@ -309,8 +309,8 @@ public int compareTo(NullerInformation o) {
         }
     }
 
+    @SuppressWarnings("unchecked")
     private static ArrayList<InstructionBlock>[] computePredecessors(List<InstructionBlock> blocks) {
-        @SuppressWarnings("unchecked")
         ArrayList<InstructionBlock>[] result = new ArrayList[blocks.size()];
         for (int i = 0; i < blocks.size(); i++) {
             result[i] = new ArrayList<>(2);

diff --git a/...cts/com.oracle.truffle.llvm.parser/src/com/oracle/truffle/llvm/parser/LLVMPhiManager.java b/...cts/com.oracle.truffle.llvm.parser/src/com/oracle/truffle/llvm/parser/LLVMPhiManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates.
+ * Copyright (c) 2016, 2020, Oracle and/or its affiliates.
  *
  * All rights reserved.
  *
@@ -110,10 +110,10 @@ public SymbolImpl getValue() {
         }
     }
 
+    @SuppressWarnings("unchecked")
     public static ArrayList<Phi>[] getPhisForSuccessors(TerminatingInstruction terminatingInstruction, List<Phi> phis) {
         assert phis != null;
 
-        @SuppressWarnings("unchecked")
         ArrayList<Phi>[] phisPerSuccessor = new ArrayList[terminatingInstruction.getSuccessorCount()];
         for (int i = 0; i < phisPerSuccessor.length; i++) {
             phisPerSuccessor[i] = new ArrayList<>();

diff --git a/vm/mx.vm/suite.py b/vm/mx.vm/suite.py
@@ -90,7 +90,7 @@
             },
             {
                 "name": "graalpython",
-                "version": "f991e52b9efaf89da367d218f268f8a84956c591",
+                "version": "62095a2104cbc21c4bb5f3fa7cb2d3f08cf21410",
                 "dynamic": True,
                 "urls": [
                     {"url": "https://github.com/graalvm/graalpython.git", "kind": "git"},