aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/com/android/tools/r8/ir/optimize/PeepholeOptimizer.java
diff options
context:
space:
mode:
authorIan Zerny <zerny@google.com>2017-07-04 13:08:40 +0200
committerIan Zerny <zerny@google.com>2017-07-04 11:10:40 +0000
commitd50d8ed50f8f39cf8e6722688e8a7b88e234b32d (patch)
tree456db1a019c48cb8ae34f89f0251dcd0bec96454 /src/main/java/com/android/tools/r8/ir/optimize/PeepholeOptimizer.java
parent2dce44a08e86d3a6dccf63eb6ddd15d309a0a415 (diff)
downloadr8-d50d8ed50f8f39cf8e6722688e8a7b88e234b32d.tar.gz
Update the instruction block pointer when creating shared suffix blocks.
R=sgjesse Bug: Change-Id: I0d9288c35f3e31cd08b2c52f53327f27ccf029c5
Diffstat (limited to 'src/main/java/com/android/tools/r8/ir/optimize/PeepholeOptimizer.java')
-rw-r--r--src/main/java/com/android/tools/r8/ir/optimize/PeepholeOptimizer.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/com/android/tools/r8/ir/optimize/PeepholeOptimizer.java b/src/main/java/com/android/tools/r8/ir/optimize/PeepholeOptimizer.java
index b5b0bd31d..de81dfeff 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/PeepholeOptimizer.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/PeepholeOptimizer.java
@@ -107,6 +107,7 @@ public class PeepholeOptimizer {
Instruction instruction = from.previous();
movedThrowingInstruction = movedThrowingInstruction || instruction.instructionTypeCanThrow();
newBlock.getInstructions().addFirst(instruction);
+ instruction.setBlock(newBlock);
}
if (movedThrowingInstruction && first.hasCatchHandlers()) {
newBlock.transferCatchHandlers(first);