| commit | 02585900d1c18d736e3c8d97af0fa53df08e37d3 | [log] [tgz] |
|---|---|---|
| author | Morten Krogh-Jespersen <mkroghj@google.com> | Thu Nov 10 17:49:51 2022 +0100 |
| committer | Morten Krogh-Jespersen <mkroghj@google.com> | Thu Nov 10 17:49:51 2022 +0100 |
| tree | 4f30eba1bf14a37cbd3a1d6c164ec96d35ea1978 | |
| parent | ea1c1036e5d4b5169fc1789bf8412784127229e0 [diff] |
Report stderr if failed compilation R8 compilation on art Change-Id: I30525c644307ec87ec54f83d6d58d7ee49f2193b
diff --git a/src/main/java/com/android/tools/r8/optimize/MemberRebindingIdentityLens.java b/src/main/java/com/android/tools/r8/optimize/MemberRebindingIdentityLens.java index 0dbea46..2e6fb53 100644 --- a/src/main/java/com/android/tools/r8/optimize/MemberRebindingIdentityLens.java +++ b/src/main/java/com/android/tools/r8/optimize/MemberRebindingIdentityLens.java
@@ -87,11 +87,11 @@ private DexMethod getReboundMethodReference(DexMethod method) { DexMethod rebound = nonReboundMethodReferenceToDefinitionMap.get(method); + assert method != rebound; while (rebound != null) { method = rebound; rebound = nonReboundMethodReferenceToDefinitionMap.get(method); } - assert method != rebound; return method; }
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/r8ondex/R8CompiledThroughDexTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/r8ondex/R8CompiledThroughDexTest.java index 1e56f81..7de441c 100644 --- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/r8ondex/R8CompiledThroughDexTest.java +++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/r8ondex/R8CompiledThroughDexTest.java
@@ -206,7 +206,7 @@ if (artProcessResult.exitCode != 0) { System.out.println(artProcessResult); } - assertEquals(0, artProcessResult.exitCode); + assertEquals(artProcessResult.stderr, 0, artProcessResult.exitCode); assertProgramsEqual( "The output of R8/JVM in-process and R8/ART external differ.", outputThroughCf,