commit 9789ac0ca2f999f56d21f36a5ed58a4877b46f03
author Ian Zerny <zerny@google.com> Thu Nov 02 14:46:59 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 02 14:46:59 2017 +0000
tree 9a2f6b1436334ef8976185704d729c228ad4b141
parent 9b124ffa36eb24f463e1ea35ac254628c7c8494d
parent 514b7fba6ab305ac4cd8cbf1104fb96609d74061

Merge "[CF] Even align index of locals to avoid overlap between single and wide."

src/main/java/com/android/tools/r8/ir/code/Load.java

diff --git a/src/main/java/com/android/tools/r8/ir/code/Load.java b/src/main/java/com/android/tools/r8/ir/code/Load.java
index a8bb95c..28d4165 100644
--- a/src/main/java/com/android/tools/r8/ir/code/Load.java
+++ b/src/main/java/com/android/tools/r8/ir/code/Load.java
@@ -44,6 +44,6 @@
   @Override
   public void buildCf(CfBuilder builder) {
     Value value = inValues.get(0);
-    builder.add(new CfLoad(value.outType(), value.getNumber()));
+    builder.add(new CfLoad(value.outType(), 2 * value.getNumber()));
   }
 }

src/main/java/com/android/tools/r8/ir/code/Store.java

diff --git a/src/main/java/com/android/tools/r8/ir/code/Store.java b/src/main/java/com/android/tools/r8/ir/code/Store.java
index e5b90a3..2a22f28 100644
--- a/src/main/java/com/android/tools/r8/ir/code/Store.java
+++ b/src/main/java/com/android/tools/r8/ir/code/Store.java
@@ -43,6 +43,6 @@
 
   @Override
   public void buildCf(CfBuilder builder) {
-    builder.add(new CfStore(outType(), outValue.getNumber()));
+    builder.add(new CfStore(outType(), 2 * outValue.getNumber()));
   }
 }

src/main/java/com/android/tools/r8/ir/conversion/CfBuilder.java

diff --git a/src/main/java/com/android/tools/r8/ir/conversion/CfBuilder.java b/src/main/java/com/android/tools/r8/ir/conversion/CfBuilder.java
index cb5b445..8c00fcc 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/CfBuilder.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/CfBuilder.java
@@ -128,7 +128,7 @@
       }
     }
     assert currentStack == 0;
-    return new CfCode(maxStack, maxLocalNumber + 1, instructions);
+    return new CfCode(maxStack, 2 * (maxLocalNumber + 1), instructions);
   }
 
   // Callbacks