| commit | dc5ee385cb13c98c172c8dbcdc6d77da38d7e2f8 | [log] [tgz] |
|---|---|---|
| author | Christoffer Adamsen <christofferqa@google.com> | Thu Jun 13 10:21:37 2024 +0200 |
| committer | Christoffer Adamsen <christofferqa@google.com> | Thu Jun 13 10:21:37 2024 +0200 |
| tree | e371abd5ff52925f1cf9bc3ff90a43ef1797481e | |
| parent | 61fd879fca4016f593f3f6aa679f7184d184d724 [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 bae6bb9..4a9e696 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
@@ -50,8 +50,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(),