diff options
| author | 2021-11-01 11:48:06 +0000 | |
|---|---|---|
| committer | 2021-11-01 14:31:37 +0000 | |
| commit | 72be14ed06b76cd0e83392145cec9025ff43d174 (patch) | |
| tree | aa186f70ea70011d428ab91a1f4a3fb0c2e39de5 /compiler/optimizing/nodes.cc | |
| parent | 667584d95926af5f0f6e392ab2dc575cc2906c51 (diff) | |
Revert "Add support for calling entry / exit hooks directly from JIT code"
This reverts commit 2d4feeb67912d64b9e980e6687794826a5c22f9d.
Reason for revert: This breaks no-image tests. Example failure: https://android-build.googleplex.com/builds/submitted/7871904/art-no-image/latest/view/logs/build_error.log
Change-Id: I0f97c672c2d48f125931171ee1041a7c1cf20127
Diffstat (limited to 'compiler/optimizing/nodes.cc')
| -rw-r--r-- | compiler/optimizing/nodes.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/compiler/optimizing/nodes.cc b/compiler/optimizing/nodes.cc index 24786931f2..17080f0056 100644 --- a/compiler/optimizing/nodes.cc +++ b/compiler/optimizing/nodes.cc @@ -2913,10 +2913,7 @@ HInstruction* HGraph::InlineInto(HGraph* outer_graph, HInvoke* invoke) { } else if (current->IsCurrentMethod()) { replacement = outer_graph->GetCurrentMethod(); } else { - // It is OK to ignore MethodEntryHook for inlined functions. - // In debug mode we don't inline and in release mode method - // tracing is best effort so OK to ignore them. - DCHECK(current->IsGoto() || current->IsSuspendCheck() || current->IsMethodEntryHook()); + DCHECK(current->IsGoto() || current->IsSuspendCheck()); entry_block_->RemoveInstruction(current); } if (replacement != nullptr) { |