commit | 602f3a84b0eb8e6eee80a3c1d340ad31a1b52b86 | [log] [tgz] |
---|---|---|
author | Christoffer Adamsen <christofferqa@google.com> | Thu Jun 13 12:43:07 2024 +0200 |
committer | Christoffer Adamsen <christofferqa@google.com> | Thu Jun 13 11:29:10 2024 +0000 |
tree | b78696d7d916122cf58f5100ba1a6b2874c1ee96 | |
parent | 6a79c01824982d731d196f479d57f851c311ab10 [diff] |
Account for DexItemBasedConstString in StringSwitch conversion Bug: b/344939647 Change-Id: If09989ecb946a3efcf866d0e1be8d3fff262b2fd
diff --git a/src/main/java/com/android/tools/r8/ir/conversion/LirConverter.java b/src/main/java/com/android/tools/r8/ir/conversion/LirConverter.java index c067459..ee7d208 100644 --- a/src/main/java/com/android/tools/r8/ir/conversion/LirConverter.java +++ b/src/main/java/com/android/tools/r8/ir/conversion/LirConverter.java
@@ -49,8 +49,8 @@ CodeRewriterPassCollection codeRewriterPassCollection = new CodeRewriterPassCollection( new ConstResourceNumberRewriter(appView), - new IdentifierNameStringMarker(appView), - new StringSwitchConverter(appView)); + new StringSwitchConverter(appView), + new IdentifierNameStringMarker(appView)); // Convert code objects to LIR. ThreadUtils.processItems( appView.appInfo().classes(),