Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(191)

Unified Diff: src/deoptimizer.cc

Issue 1633633002: [Interpreter] Fix deopting from inline functions. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Rebase Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/builtins.h ('k') | src/frames.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/deoptimizer.cc
diff --git a/src/deoptimizer.cc b/src/deoptimizer.cc
index 4bdafbf1b4113639373f9a5a2ef39f690f8ffd7e..abc8154d3545164a8699f1b809c0d511a1cfac68 100644
--- a/src/deoptimizer.cc
+++ b/src/deoptimizer.cc
@@ -1211,14 +1211,15 @@ void Deoptimizer::DoComputeInterpretedFrame(int frame_index) {
value_iterator++;
Builtins* builtins = isolate_->builtins();
- Code* trampoline = builtins->builtin(Builtins::kInterpreterEntryTrampoline);
- output_frame->SetPc(reinterpret_cast<intptr_t>(trampoline->entry()));
+ Code* dispatch_builtin =
+ builtins->builtin(Builtins::kInterpreterEnterBytecodeDispatch);
+ output_frame->SetPc(reinterpret_cast<intptr_t>(dispatch_builtin->entry()));
output_frame->SetState(0);
// Update constant pool.
if (FLAG_enable_embedded_constant_pool) {
intptr_t constant_pool_value =
- reinterpret_cast<intptr_t>(trampoline->constant_pool());
+ reinterpret_cast<intptr_t>(dispatch_builtin->constant_pool());
output_frame->SetConstantPool(constant_pool_value);
if (is_topmost) {
Register constant_pool_reg =
« no previous file with comments | « src/builtins.h ('k') | src/frames.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698