From fc42ce1a2b013059b7868ffc69d35fade6c5b743 Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Wed, 21 Jul 2021 15:51:35 +0100 Subject: Fix `GetDataTypeFromShorty()` for inlined VarHandle intrinsics. Test: testrunner.py --host --optimizing --jit Bug: 188889082 Change-Id: Ide335dc408f5bd2c9256d4cac5ba66d2d390f69b --- compiler/optimizing/intrinsics_utils.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'compiler/optimizing/intrinsics_utils.h') diff --git a/compiler/optimizing/intrinsics_utils.h b/compiler/optimizing/intrinsics_utils.h index 3349c5202f..546d5b3b93 100644 --- a/compiler/optimizing/intrinsics_utils.h +++ b/compiler/optimizing/intrinsics_utils.h @@ -111,8 +111,8 @@ static inline size_t GetExpectedVarHandleCoordinatesCount(HInvoke *invoke) { static inline DataType::Type GetDataTypeFromShorty(HInvoke* invoke, uint32_t index) { DCHECK(invoke->IsInvokePolymorphic()); - const DexFile& dex_file = invoke->GetBlock()->GetGraph()->GetDexFile(); - const char* shorty = dex_file.GetShorty(invoke->AsInvokePolymorphic()->GetProtoIndex()); + const DexFile* dex_file = invoke->GetMethodReference().dex_file; + const char* shorty = dex_file->GetShorty(invoke->AsInvokePolymorphic()->GetProtoIndex()); DCHECK_LT(index, strlen(shorty)); return DataType::FromShorty(shorty[index]); -- cgit v1.2.3-59-g8ed1b