Address comments from aosp/3282234

Follow up to aosp/3282234 regarding comments after submission.

Bug: 362916226
Test: art/test/testrunner/testrunner.py --host --64 --optimizing -b
Change-Id: Id572dd42e5aa877f4ae4a20cd43ad7a778e92815

1 files changed, 2 insertions, 1 deletions

diff --git a/compiler/optimizing/intrinsics_riscv64.cc b/compiler/optimizing/intrinsics_riscv64.cc
index 4e5dbe4d23..f705aa2a60 100644
--- a/compiler/optimizing/intrinsics_riscv64.cc
+++ b/compiler/optimizing/intrinsics_riscv64.cc
@@ -4466,8 +4466,8 @@ static void CreateVarHandleGetAndUpdateLocations(HInvoke* invoke,
   }
 
   // Get the type from the shorty as the invokes may not return a value.
-  LocationSummary* locations = CreateVarHandleCommonLocations(invoke, codegen);
   uint32_t arg_index = invoke->GetNumberOfArguments() - 1;
+  DCHECK_EQ(arg_index, 1u + GetExpectedVarHandleCoordinatesCount(invoke));
   DataType::Type value_type = GetDataTypeFromShorty(invoke, arg_index);
   if (value_type == DataType::Type::kReference && codegen->EmitNonBakerReadBarrier()) {
     // Unsupported for non-Baker read barrier because the artReadBarrierSlow() ignores
@@ -4481,6 +4481,7 @@ static void CreateVarHandleGetAndUpdateLocations(HInvoke* invoke,
     return;
   }
 
+  LocationSummary* locations = CreateVarHandleCommonLocations(invoke, codegen);
   Location arg = locations->InAt(arg_index);
 
   bool is_fp = DataType::IsFloatingPointType(value_type);