commit | f8468a7ea82b6921f9f63fd7d666de36dedf2ff6 | [log] [tgz] |
---|---|---|
author | Rico Wind <ricow@google.com> | Tue Jul 03 14:44:58 2018 +0200 |
committer | Rico Wind <ricow@google.com> | Tue Jul 03 14:44:58 2018 +0200 |
tree | 33c3e831b6fecc80f2f227b10ca3f08c1f7ac8f5 | |
parent | b74479df124cafe25729d6165d0878fcd24be5f4 [diff] |
Version 1.2.30 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 8c50de9..a6a6702 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 = "1.2.29"; + public static final String LABEL = "1.2.30"; 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 1ea788d..9c5627c 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
@@ -315,7 +315,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 {