diff options
author | 2022-04-08 09:52:34 +0000 | |
---|---|---|
committer | 2022-04-08 14:12:58 +0000 | |
commit | e953942ad672b7bb2b71ccc40d1cfd6cbbc81995 (patch) | |
tree | 19a4f14d1238d91fdb7df25ca088ad87e579063b /compiler/optimizing/optimizing_compiler.cc | |
parent | 0da1a77317f1263eea934f9a379626b6c3bd8d9d (diff) |
Revert^2 "Pass `ArenaAllocator` to JNI compiler."
This reverts commit aa5a644f17aab27dee172642a276bd24e69a5b54.
Reason for revert: The original CL was wrongly blamed for
unrelated breakage. The LUCI row contains 6 red cells but
one is a known flake and the other 5 are mis-attributed and
clicking through to the manifests reveals the real culprit
to be https://android-review.googlesource.com/2049787 .
Change-Id: Ie34d9652d3cbe882a73f9eece0d30dfd9a3d15a6
Test: Rely on TreeHugger.
Bug: 181943478
Diffstat (limited to 'compiler/optimizing/optimizing_compiler.cc')
-rw-r--r-- | compiler/optimizing/optimizing_compiler.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc index ca440326ac..6eb3d01e42 100644 --- a/compiler/optimizing/optimizing_compiler.cc +++ b/compiler/optimizing/optimizing_compiler.cc @@ -1183,7 +1183,7 @@ CompiledMethod* OptimizingCompiler::JniCompile(uint32_t access_flags, } JniCompiledMethod jni_compiled_method = ArtQuickJniCompileMethod( - compiler_options, access_flags, method_idx, dex_file); + compiler_options, access_flags, method_idx, dex_file, &allocator); MaybeRecordStat(compilation_stats_.get(), MethodCompilationStat::kCompiledNativeStub); ScopedArenaAllocator stack_map_allocator(&arena_stack); // Will hold the stack map. @@ -1234,7 +1234,7 @@ bool OptimizingCompiler::JitCompile(Thread* self, if (UNLIKELY(method->IsNative())) { JniCompiledMethod jni_compiled_method = ArtQuickJniCompileMethod( - compiler_options, access_flags, method_idx, *dex_file); + compiler_options, access_flags, method_idx, *dex_file, &allocator); std::vector<Handle<mirror::Object>> roots; ArenaSet<ArtMethod*, std::less<ArtMethod*>> cha_single_implementation_list( allocator.Adapter(kArenaAllocCHA)); |