From 0f6befa0f064d482cc252913f46ba8264b7e0384 Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Thu, 7 Mar 2024 16:11:09 +0100 Subject: Pass only shorty to `ArtQuickJniCompileMethod()`. Passing a `dex_file` and `method_idx` makes testing unnecessarily difficult. Test: m test-art-host-gtest Test: testrunner.py --host --optimizing Bug: 288983053 Change-Id: Ice79423ec568e254547acd4448fb82e2ad11b79c --- compiler/optimizing/code_generator.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'compiler/optimizing/code_generator.h') diff --git a/compiler/optimizing/code_generator.h b/compiler/optimizing/code_generator.h index c54c96c40f..73059313e2 100644 --- a/compiler/optimizing/code_generator.h +++ b/compiler/optimizing/code_generator.h @@ -597,7 +597,7 @@ class CodeGenerator : public DeletableArenaObject { template + size_t GetCriticalNativeDirectCallFrameSize(std::string_view shorty)> size_t PrepareCriticalNativeCall(HInvokeStaticOrDirect* invoke) { DCHECK(!invoke->GetLocations()->Intrinsified()); CriticalNativeCallingConventionVisitor calling_convention_visitor( @@ -607,9 +607,8 @@ class CodeGenerator : public DeletableArenaObject { size_t out_frame_size = RoundUp(calling_convention_visitor.GetStackOffset(), kNativeStackAlignment); if (kIsDebugBuild) { - uint32_t shorty_len; - const char* shorty = GetCriticalNativeShorty(invoke, &shorty_len); - CHECK_EQ(GetCriticalNativeDirectCallFrameSize(shorty, shorty_len), out_frame_size); + std::string_view shorty = GetCriticalNativeShorty(invoke); + CHECK_EQ(GetCriticalNativeDirectCallFrameSize(shorty), out_frame_size); } if (out_frame_size != 0u) { FinishCriticalNativeFrameSetup(out_frame_size, ¶llel_move); @@ -882,7 +881,7 @@ class CodeGenerator : public DeletableArenaObject { void FinishCriticalNativeFrameSetup(size_t out_frame_size, /*inout*/HParallelMove* parallel_move); - static const char* GetCriticalNativeShorty(HInvokeStaticOrDirect* invoke, uint32_t* shorty_len); + static std::string_view GetCriticalNativeShorty(HInvokeStaticOrDirect* invoke); OptimizingCompilerStats* stats_; -- cgit v1.2.3-59-g8ed1b