commit a3d5200c6ebe77c33e2ac9a139927e58fc34f3a4
author Christoffer Quist Adamsen <christofferqa@google.com> Tue May 31 06:39:18 2022 +0200
committer Christoffer Adamsen <christofferqa@google.com> Tue May 31 06:32:59 2022 +0000
tree cde8a1c6eac798af21ead70786344e8061e69c74
parent 37b86d188ba3569476a87340bdee15b368d93411

Use provided code lens for stack frame verification

Change-Id: I8d3f336e78ee2f765028807fc30863c8f4b5b612

src/main/java/com/android/tools/r8/cf/code/CfFrameVerificationHelper.java

diff --git a/src/main/java/com/android/tools/r8/cf/code/CfFrameVerificationHelper.java b/src/main/java/com/android/tools/r8/cf/code/CfFrameVerificationHelper.java
index 7c73bbb..4c21ed6 100644
--- a/src/main/java/com/android/tools/r8/cf/code/CfFrameVerificationHelper.java
+++ b/src/main/java/com/android/tools/r8/cf/code/CfFrameVerificationHelper.java
@@ -46,12 +46,13 @@
   public CfFrameVerificationHelper(
       AppView<?> appView,
       CfCode code,
+      GraphLens codeLens,
       ProgramMethod method,
       Map<CfLabel, CfFrame> stateMap,
       List<CfTryCatch> tryCatchRanges) {
     this.appView = appView;
     this.code = code;
-    this.codeLens = code.getCodeLens(appView);
+    this.codeLens = codeLens;
     this.method = method;
     this.previousMethod =
         appView.graphLens().getOriginalMethodSignature(method.getReference(), codeLens);

src/main/java/com/android/tools/r8/graph/CfCode.java

diff --git a/src/main/java/com/android/tools/r8/graph/CfCode.java b/src/main/java/com/android/tools/r8/graph/CfCode.java
index 42d0bcd..f0598cd 100644
--- a/src/main/java/com/android/tools/r8/graph/CfCode.java
+++ b/src/main/java/com/android/tools/r8/graph/CfCode.java
@@ -953,7 +953,7 @@
           CfCodeStackMapValidatingException.noFramesForMethodWithJumps(method, appView), appView);
     }
     CfFrameVerificationHelper helper =
-        new CfFrameVerificationHelper(appView, this, method, stateMap, tryCatchRanges);
+        new CfFrameVerificationHelper(appView, this, codeLens, method, stateMap, tryCatchRanges);
     CfCodeDiagnostics diagnostics = helper.checkTryCatchRanges();
     if (diagnostics != null) {
       return reportStackMapError(diagnostics, appView);