commit 96aebe09dbe51503e5e86020957c9fb76b241296
author Sebastien Hertz <shertz@google.com> Tue Sep 12 16:18:50 2017 +0200
committer Sebastien Hertz <shertz@google.com> Tue Sep 12 16:18:50 2017 +0200
tree 155da75a4e5902fa8e6187344d56b47f8c13bf08
parent 391924b95c5216f8359ca3bec4766fe937ea7a47

Show monitor type in Monitor.toString

Makes debugging of Monitor instructions easier by overriding
getInstructionName to return either "MonitorEnter" or
"MonitorExit" as instruction name.

Change-Id: I4f53726d88c02aa30756a1b35bda3b4352a83ebe

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

diff --git a/src/main/java/com/android/tools/r8/ir/code/Monitor.java b/src/main/java/com/android/tools/r8/ir/code/Monitor.java
index a3b71e1..3c0c062 100644
--- a/src/main/java/com/android/tools/r8/ir/code/Monitor.java
+++ b/src/main/java/com/android/tools/r8/ir/code/Monitor.java
@@ -8,6 +8,7 @@
 
 import com.android.tools.r8.code.MonitorEnter;
 import com.android.tools.r8.code.MonitorExit;
+import com.android.tools.r8.errors.Unreachable;
 import com.android.tools.r8.graph.AppInfoWithSubtyping;
 import com.android.tools.r8.graph.DexType;
 import com.android.tools.r8.ir.conversion.DexBuilder;
@@ -89,4 +90,16 @@
     // Conservative choice.
     return Constraint.NEVER;
   }
+
+  @Override
+  public String getInstructionName() {
+    switch (type) {
+      case ENTER:
+        return "MonitorEnter";
+      case EXIT:
+        return "MonitorExit";
+      default:
+        throw new Unreachable("Unknown monitor type:" + type);
+    }
+  }
 }