)]}' { "commit": "b4d98398932823585ad32180623e9cb0da46d7af", "tree": "0b25c92e050e46006b9299111e6438488fcede7c", "parents": [ "297f7f47f041f6d1c8d784b915251822ffc0c823" ], "author": { "name": "Jonathan Starup", "email": "jonathanlist@google.com", "time": "Mon Sep 28 09:01:38 2026 -0700" }, "committer": { "name": "r8-scoped@luci-project-accounts.iam.gserviceaccount.com", "email": "r8-scoped@luci-project-accounts.iam.gserviceaccount.com", "time": "Mon Sep 28 09:02:50 2026 -0700" }, "message": "Revert \"Reland \"Fix Kotlin inline retrace support and SMAP parsing.\"\"\n\nThis reverts commit 48b808dd9ba6940019bb5c50dfdddd9f378d8620.\n\nReason for revert: OOM on CI\n\nFailure Link: https://ci.chromium.org/ui/p/r8/builders/ci/linux-android-12/2189\n\nOriginal change\u0027s description:\n\u003e Reland \"Fix Kotlin inline retrace support and SMAP parsing.\"\n\u003e\n\u003e This now only finds references for live classes.\n\u003e\n\u003e This is a reland of commit a412c4aba9a651046e5c726b872865f8ed8c737a\n\u003e\n\u003e Original change\u0027s description:\n\u003e \u003e Fix Kotlin inline retrace support and SMAP parsing.\n\u003e \u003e\n\u003e \u003e Kotlin code can contain inlined methods which is annotated with\n\u003e \u003e \u003cfile\u003e:\u003cline\u003e-\u003cline\u003e to describe where it was inlined from. This means\n\u003e \u003e that we have to resolve such references to actual methods in the source\n\u003e \u003e to preserve them in the output mapping.\n\u003e \u003e\n\u003e \u003e In R8 partial, an inlined reference might point into D8 code, which\n\u003e \u003e means that both branches need \"full\" and upfront info to resolve them.\n\u003e \u003e\n\u003e \u003e This CL stores where methods start and end for files referenced by\n\u003e \u003e inline annotations if output mapping files are enabled. This data does\n\u003e \u003e not need maintenance since it should always refer to the input program.\n\u003e \u003e\n\u003e \u003e I also fixed the handling of overlapping ranges in the SMAP parser to\n\u003e \u003e comply with specs.\n\u003e \u003e\n\u003e \u003e Fixes: b/391785584\n\u003e \u003e Change-Id: I77759eeddef82ec1960df11aa75c6bf5c22e67e0\n\u003e\n\u003e Change-Id: I5a623ce9984cd3489aa91b49fd066a28a76aaf80\n\nTBR\u003dchristofferqa@google.com,r8-scoped@luci-project-accounts.iam.gserviceaccount.com,android-build-ayeaye@system.gserviceaccount.com,jonathanlist@google.com\n\nNo-Presubmit: true\nNo-Tree-Checks: true\nNo-Try: true\nChange-Id: I48f0a476a5a889f1d775ebf2ce17ffd6a20ac847\n", "tree_diff": [ { "type": "modify", "old_id": "cf89c642a94a274bdd9d9e83a5c6457932ed41e2", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/D8.java", "new_id": "f1690441416aec441cd33762b7573fbe4389426f", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/D8.java" }, { "type": "modify", "old_id": "ca321a8770582c747da965f66c86d1fb19a722e5", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/GlobalSyntheticsGenerator.java", "new_id": "0ae18a89fce628da4522337873f0cdeb2105c3a0", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/GlobalSyntheticsGenerator.java" }, { "type": "modify", "old_id": "91cb423578b2317169a92f4e740ca3a1b4efbafd", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/R8.java", "new_id": "b67a71c92fcd434404207b5e03334d9c8d629f08", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/R8.java" }, { "type": "modify", "old_id": "55d55f38eed783f1f3356426b1fb53f7206c79fb", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/dex/ApplicationWriter.java", "new_id": "5f386f25c1cca32fe4d53c43e0e632ed81ca191d", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/dex/ApplicationWriter.java" }, { "type": "modify", "old_id": "e30476f3a818261930e093ef0f97c82033c27f2e", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/graph/AppInfo.java", "new_id": "7c09caf2f180c8ea961491463062995bbdf4bf92", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/graph/AppInfo.java" }, { "type": "modify", "old_id": "be83481eb4509ebe063d9440c3c5f5f25e96581a", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/graph/AppView.java", "new_id": "92d95f3fd8cf6a278df9a1c20ed59d2db2ec2369", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/graph/AppView.java" }, { "type": "modify", "old_id": "c3acc1b96ea67d9d8d1a982ba7cee7b5d64d84d5", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/graph/DexApplication.java", "new_id": "513b41bc743d1c1df7cc0a07c42f7a6571634a98", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/graph/DexApplication.java" }, { "type": "modify", "old_id": "2ed72235f349faa8cdc9934f5a8889beaa644c14", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/ir/desugar/BackportedMethodRewriter.java", "new_id": "b7c90de579319d30ffc07533ce4dcf9cdeb7b46d", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/ir/desugar/BackportedMethodRewriter.java" }, { "type": "modify", "old_id": "4851feb7abc96698349bb7301be9dea802231a9c", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/ir/desugar/LambdaMainMethodSourceCode.java", "new_id": "35152b49adfbf6037f872ec0d2f4af64afc7a40a", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/ir/desugar/LambdaMainMethodSourceCode.java" }, { "type": "modify", "old_id": "d75b65112ec6b5c60ba438fa945a7d80b308dc29", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/ir/desugar/NonEmptyCfInstructionDesugaringCollection.java", "new_id": "2dad2dea724d50464a51054559e04dcede0fc0d5", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/ir/desugar/NonEmptyCfInstructionDesugaringCollection.java" }, { "type": "modify", "old_id": "08aa1dd9f47ab1f8640aa675809d3406fb45be86", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/ir/desugar/typeswitch/SwitchHelperGenerator.java", "new_id": "cb522b79594eea17649d69c77fdde8acc766fe38", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/ir/desugar/typeswitch/SwitchHelperGenerator.java" }, { "type": "modify", "old_id": "e6f4af46e551b368edbd40fab735b79a52e07b8d", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/jar/CfApplicationWriter.java", "new_id": "b63774d0cc6ff5f722f9f6c8b519fda7dc0e6163", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/jar/CfApplicationWriter.java" }, { "type": "delete", "old_id": "8fa6444f4f777e9f241a80ba41741551735dad1d", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/kotlin/KotlinInlineMethodMap.java", "new_id": "0000000000000000000000000000000000000000", "new_mode": 0, "new_path": "/dev/null" }, { "type": "modify", "old_id": "398cc8b298a2217ee00ff0c7500be678a363870d", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/kotlin/KotlinSourceDebugExtensionParser.java", "new_id": "e2efac1c289e0912a6118b7f8b306c12728f1c23", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/kotlin/KotlinSourceDebugExtensionParser.java" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "7a25330726d84a2e28ac44c83a026c47faac8650", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/utils/CfLineToMethodMapper.java" }, { "type": "modify", "old_id": "870c77e3532d828b686305aa99ecefd2ae369ced", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/utils/InternalOptions.java", "new_id": "aace626feb4a40df4ffbac0dad90316bc53f2e0b", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/utils/InternalOptions.java" }, { "type": "modify", "old_id": "3250b818dae296b2c556518c0ee859470dea0106", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/utils/ThreadUtils.java", "new_id": "6da517c7a9deba47dea517df3ce43ee817a2859d", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/utils/ThreadUtils.java" }, { "type": "modify", "old_id": "cf6aed06d7d3c8be852c4e57ac670000eef84c26", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/utils/positions/AppPositionRemapper.java", "new_id": "c46e0ac1103000154c09a977d3462fdf568cfa3d", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/utils/positions/AppPositionRemapper.java" }, { "type": "modify", "old_id": "5ae3009848b29f1a6dfe3b9d6e8ce5ca3536fecc", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/utils/positions/ClassPositionRemapper.java", "new_id": "b9ca045f58a9cffc96ebbbbdea44d811a9ec1418", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/utils/positions/ClassPositionRemapper.java" }, { "type": "modify", "old_id": "f0f83e567a34f8852f5bfc650503c1cc922c2a53", "old_mode": 33188, "old_path": "src/main/java/com/android/tools/r8/utils/positions/LineNumberOptimizer.java", "new_id": "eefbd731e1c6c1e812de78c949c4baed9d5071ca", "new_mode": 33188, "new_path": "src/main/java/com/android/tools/r8/utils/positions/LineNumberOptimizer.java" }, { "type": "delete", "old_id": "a3a6819cd9f79f4b23882ac3dc0bc260d00d0bdd", "old_mode": 33188, "old_path": "src/test/java/com/android/tools/r8/utils/ImmutableDisjointIntRangeMapTest.java", "new_id": "0000000000000000000000000000000000000000", "new_mode": 0, "new_path": "/dev/null" }, { "type": "modify", "old_id": "162f31ba9d01eaa377b42488fba9675d941d5d03", "old_mode": 33188, "old_path": "src/test/java8/kotlin/com/android/tools/r8/kotlin/KotlinSourceDebugExtensionParserTest.java", "new_id": "4aff93af69ec474128ae2c89fcc683694cdb08b7", "new_mode": 33188, "new_path": "src/test/java8/kotlin/com/android/tools/r8/kotlin/KotlinSourceDebugExtensionParserTest.java" }, { "type": "delete", "old_id": "34b6e625233629cdd0727c23ed5c4186f9f7b26a", "old_mode": 33188, "old_path": "src/test/java8/kotlin/com/android/tools/r8/partial/kotlin/InlineTest.kt", "new_id": "0000000000000000000000000000000000000000", "new_mode": 0, "new_path": "/dev/null" }, { "type": "delete", "old_id": "2bf1833b41d98e90fac4794ce648d2fe5a3b2dbc", "old_mode": 33188, "old_path": "src/test/java8/kotlin/com/android/tools/r8/partial/kotlin/PartialCompilationKotlinInlineFunctionTest.java", "new_id": "0000000000000000000000000000000000000000", "new_mode": 0, "new_path": "/dev/null" }, { "type": "modify", "old_id": "6c45ff394de729128a7b166b32c2eedd7e8691f2", "old_mode": 33188, "old_path": "src/test/testbase/java/com/android/tools/r8/ToolHelper.java", "new_id": "78c22626662281f7ffacd0c1c91b4c2db38405ff", "new_mode": 33188, "new_path": "src/test/testbase/java/com/android/tools/r8/ToolHelper.java" }, { "type": "delete", "old_id": "64c5d23a121d9eb945155bc2b4a967ea433cf5b5", "old_mode": 33188, "old_path": "src/utils/java/com/android/tools/r8/utils/internal/collections/ImmutableDisjointIntRangeMap.java", "new_id": "0000000000000000000000000000000000000000", "new_mode": 0, "new_path": "/dev/null" } ] }