commit cac3a729c47f5457576f771a674640d5728ce489
author Nicolas Geoffray <ngeoffray@google.com> Mon Jan 16 10:22:48 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jan 16 10:22:48 2023 +0000
tree df5d8c76a724463fbe21ea05a482e40613cf78bb
parent 1be52fb72b3fe714458c9abdc54878c6fba94b0c
parent 058f83c3f147a85b05bbecd4c8b177bb337c7c0e

Fix two brainos in veridex. am: e92bc531dc am: 058f83c3f1

Original change: https://android-review.googlesource.com/c/platform/art/+/2388216

Change-Id: I6c8f2ae31d9bbe8e2ed85d73e7bf2783d0e8f00c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

tools/veridex/flow_analysis.cc

diff --git a/tools/veridex/flow_analysis.cc b/tools/veridex/flow_analysis.cc
index 2a8b8a0..6a4d351 100644
--- a/tools/veridex/flow_analysis.cc
+++ b/tools/veridex/flow_analysis.cc
@@ -540,7 +540,7 @@
     case Instruction::FILLED_NEW_ARRAY: {
       dex::TypeIndex type_index(instruction.VRegB_35c());
       VeriClass* cls = resolver_->GetVeriClass(type_index);
-      UpdateRegister(instruction.VRegA_22c(), cls);
+      UpdateRegister(instruction.VRegA_35c(), cls);
       break;
     }
 
@@ -602,7 +602,7 @@
       if (VeriClass::sdkInt_ != nullptr && resolver_->GetField(field_index) == VeriClass::sdkInt_) {
         UpdateRegister(dest_reg, gTargetSdkVersion, VeriClass::integer_);
       } else {
-        UpdateRegister(dest_reg, GetFieldType(instruction.VRegC_22c()));
+        UpdateRegister(dest_reg, GetFieldType(field_index));
       }
       break;
     }