| commit | fc0b1b9556a5f369193df1379d575db8c2807d3c | [log] [tgz] |
|---|---|---|
| author | mikaelpeltier <mikaelpeltier@google.com> | Mon Aug 21 11:35:46 2017 +0200 |
| committer | mikaelpeltier <mikaelpeltier@google.com> | Mon Aug 21 11:35:46 2017 +0200 |
| tree | 0cea04d7104dcda509a24ce9a7ae3ef79181e0a4 | |
| parent | d1bef8014f9a1ece5695fcc41a96f216224c1718 [diff] |
isClassNameConstant return false for Phi operand Bug: 64881691 Change-Id: I347d6c4cca495f6e30360958d7bb7413e27be216
diff --git a/src/main/java/com/android/tools/r8/ir/optimize/CodeRewriter.java b/src/main/java/com/android/tools/r8/ir/optimize/CodeRewriter.java index 78d8369..815efe4 100644 --- a/src/main/java/com/android/tools/r8/ir/optimize/CodeRewriter.java +++ b/src/main/java/com/android/tools/r8/ir/optimize/CodeRewriter.java
@@ -632,6 +632,7 @@ InvokeVirtual invoke = put.inValue().definition.asInvokeVirtual(); if ((invoke.getInvokedMethod() == dexItemFactory.classMethods.getSimpleName || invoke.getInvokedMethod() == dexItemFactory.classMethods.getName) + && !invoke.inValues().get(0).isPhi() && invoke.inValues().get(0).definition.isConstClass() && invoke.inValues().get(0).definition.asConstClass().getValue() == method.method.getHolder()) {