commit 7ae0fba73fb9bf4da9809235aea447fc97046060
author Søren Gjesse <sgjesse@google.com> Tue Oct 16 11:08:22 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 16 11:08:22 2018 +0000
tree 9fd2854c1d62f2ac960b75ec07414a720c989884
parent 734c7465cbc79d98a4c52df4de4eb206fc2d5212
parent 232c84de4c2aa51638394812ec5212300d7514fb

Merge "Compiler specific compilation result"

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

diff --git a/src/main/java/com/android/tools/r8/ir/code/Dup.java b/src/main/java/com/android/tools/r8/ir/code/Dup.java
index 0932e62..640d24c 100644
--- a/src/main/java/com/android/tools/r8/ir/code/Dup.java
+++ b/src/main/java/com/android/tools/r8/ir/code/Dup.java
@@ -27,7 +27,7 @@
 
   @Override
   public void buildCf(CfBuilder builder) {
-    if (this.inValues.get(0).type == ValueType.LONG_OR_DOUBLE) {
+    if (this.inValues.get(0).type.isWide()) {
       builder.add(new CfStackInstruction(Opcode.Dup2));
     } else {
       builder.add(new CfStackInstruction(Opcode.Dup));

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

diff --git a/src/main/java/com/android/tools/r8/ir/code/StackValue.java b/src/main/java/com/android/tools/r8/ir/code/StackValue.java
index d9dabef..fdff15e 100644
--- a/src/main/java/com/android/tools/r8/ir/code/StackValue.java
+++ b/src/main/java/com/android/tools/r8/ir/code/StackValue.java
@@ -38,6 +38,10 @@
     return objectType;
   }
 
+  public StackValue duplicate(int height) {
+    return new StackValue(this.objectType, this.type.toTypeLattice(), height);
+  }
+
   @Override
   public boolean needsRegister() {
     return false;