diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2019-06-26 22:00:02 +0000 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2019-06-26 22:00:38 +0000 |
| commit | 2fef66b294417d447630f9d98de68227eef476d3 (patch) | |
| tree | 59fc4ea6cf13217eb92fbdd4e39561b5ad518cf0 /compiler/optimizing/optimizing_compiler.cc | |
| parent | 21d5994583c679cd5d8573b5d35dbd659bdca2c7 (diff) | |
Revert "Make the JIT zygote memory shared."
This reverts commit 05f87217ddc9b4b9186710c0135b918f456c5aef.
Bug: 119800099
Bug: 136110523
Reason for revert: testWebview flaking
Change-Id: I96afa6bc9c56c4aaf5ed72ae370f6f69c096c559
Diffstat (limited to 'compiler/optimizing/optimizing_compiler.cc')
| -rw-r--r-- | compiler/optimizing/optimizing_compiler.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc index 6f3b9feb9d..2153ddd7b4 100644 --- a/compiler/optimizing/optimizing_compiler.cc +++ b/compiler/optimizing/optimizing_compiler.cc @@ -384,7 +384,6 @@ class OptimizingCompiler final : public Compiler { ArtMethod* method, bool baseline, bool osr, - bool is_shared_jit_code, VariableSizedHandleScope* handles) const; CodeGenerator* TryCompileIntrinsic(ArenaAllocator* allocator, @@ -784,7 +783,6 @@ CodeGenerator* OptimizingCompiler::TryCompile(ArenaAllocator* allocator, ArtMethod* method, bool baseline, bool osr, - bool is_shared_jit_code, VariableSizedHandleScope* handles) const { MaybeRecordStat(compilation_stats_.get(), MethodCompilationStat::kAttemptBytecodeCompilation); const CompilerOptions& compiler_options = GetCompilerOptions(); @@ -852,8 +850,7 @@ CodeGenerator* OptimizingCompiler::TryCompile(ArenaAllocator* allocator, kInvalidInvokeType, dead_reference_safe, compiler_options.GetDebuggable(), - /* osr= */ osr, - /* is_shared_jit_code= */ is_shared_jit_code); + /* osr= */ osr); if (method != nullptr) { graph->SetArtMethod(method); @@ -1110,7 +1107,6 @@ CompiledMethod* OptimizingCompiler::Compile(const dex::CodeItem* code_item, method, compiler_options.IsBaseline(), /* osr= */ false, - /* is_shared_jit_code= */ false, &handles)); } } @@ -1372,7 +1368,6 @@ bool OptimizingCompiler::JitCompile(Thread* self, method, baseline, osr, - /* is_shared_jit_code= */ code_cache->IsSharedRegion(*region), &handles)); if (codegen.get() == nullptr) { return false; |