diff options
| author | Mads Ager <ager@google.com> | 2017-06-14 10:20:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-06-14 10:20:47 +0000 |
| commit | 88ee061f87a0c4c80faf39dbcf4b53290f239c2d (patch) | |
| tree | 13aa9e2952e4e9b1fbb20ee3b2d71e9a72e6ec17 /src/main/java/com/android/tools/r8/ir/regalloc | |
| parent | 6b7019cdd1b86715cbb83eeb5fcffa9363e6cbf6 (diff) | |
| parent | c52c3539f02fed10cf49d70f67f7dfd8dfa8fa97 (diff) | |
| download | r8-88ee061f87a0c4c80faf39dbcf4b53290f239c2d.tar.gz | |
Merge "Catch more cases of invalid input and give CompilationErrors."
Diffstat (limited to 'src/main/java/com/android/tools/r8/ir/regalloc')
| -rw-r--r-- | src/main/java/com/android/tools/r8/ir/regalloc/LinearScanRegisterAllocator.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/com/android/tools/r8/ir/regalloc/LinearScanRegisterAllocator.java b/src/main/java/com/android/tools/r8/ir/regalloc/LinearScanRegisterAllocator.java index 908e15e43..06918870a 100644 --- a/src/main/java/com/android/tools/r8/ir/regalloc/LinearScanRegisterAllocator.java +++ b/src/main/java/com/android/tools/r8/ir/regalloc/LinearScanRegisterAllocator.java @@ -1521,7 +1521,7 @@ public class LinearScanRegisterAllocator implements RegisterAllocator { // If we are processing an exception edge, we need to use the throwing instruction // as the instruction we are coming from. int fromInstruction = block.exit().getNumber(); - boolean isCatch = block.isCatchSuccessor(successor); + boolean isCatch = block.hasCatchSuccessor(successor); if (isCatch) { for (Instruction instruction : block.getInstructions()) { if (instruction.instructionTypeCanThrow()) { |