| commit | 5211bf966b58ca99e6bb0a1634edb81cf7621d81 | [log] [tgz] |
|---|---|---|
| author | Rico Wind <ricow@google.com> | Tue Jul 03 14:52:39 2018 +0200 |
| committer | Rico Wind <ricow@google.com> | Tue Jul 03 14:52:39 2018 +0200 |
| tree | 7f2f22e098cdae6710ef306aae8609f5cd3e018a | |
| parent | 729650926ee8960cb53d92d75831a0b6da78ccdd [diff] |
Version v1.0.34 Merge: Ensure that we never rematerialize to a >=256 register CL: https://r8-review.googlesource.com/c/r8/+/23380 Change-Id: I22c003631cc4f4ad6def221aff8e5218153dd99e
diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java index beef986..3e8c771 100644 --- a/src/main/java/com/android/tools/r8/Version.java +++ b/src/main/java/com/android/tools/r8/Version.java
@@ -11,7 +11,7 @@ // This field is accessed from release scripts using simple pattern matching. // Therefore, changing this field could break our release scripts. - public static final String LABEL = "v1.0.33"; + public static final String LABEL = "v1.0.34"; private Version() { }
diff --git a/src/main/java/com/android/tools/r8/ir/regalloc/SpillMoveSet.java b/src/main/java/com/android/tools/r8/ir/regalloc/SpillMoveSet.java index 3dc151d..48b58cc 100644 --- a/src/main/java/com/android/tools/r8/ir/regalloc/SpillMoveSet.java +++ b/src/main/java/com/android/tools/r8/ir/regalloc/SpillMoveSet.java
@@ -301,7 +301,8 @@ // avoid a bug where the index variable could end up being uninitialized. if (code.options.canHaveBoundsCheckEliminationBug() && move.from.getValue().isConstNumber() - && move.type == MoveType.SINGLE) { + && move.type == MoveType.SINGLE + && allocator.unadjustedRealRegisterFromAllocated(move.to.getRegister()) < 256) { scheduler.addMove( new RegisterMove(move.to.getRegister(), move.type, move.from.getValue().definition)); } else {