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

Side by Side Diff: src/frames.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 unified diff | Download patch
« no previous file with comments | « src/deoptimizer.cc ('k') | src/ia32/builtins-ia32.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 the V8 project authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "src/frames.h" 5 #include "src/frames.h"
6 6
7 #include <sstream> 7 #include <sstream>
8 8
9 #include "src/ast/ast.h" 9 #include "src/ast/ast.h"
10 #include "src/ast/scopeinfo.h" 10 #include "src/ast/scopeinfo.h"
(...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after
439 case Code::WASM_FUNCTION: 439 case Code::WASM_FUNCTION:
440 return STUB; 440 return STUB;
441 case Code::BUILTIN: 441 case Code::BUILTIN:
442 if (!marker->IsSmi()) { 442 if (!marker->IsSmi()) {
443 if (StandardFrame::IsArgumentsAdaptorFrame(state->fp)) { 443 if (StandardFrame::IsArgumentsAdaptorFrame(state->fp)) {
444 // An adapter frame has a special SMI constant for the context and 444 // An adapter frame has a special SMI constant for the context and
445 // is not distinguished through the marker. 445 // is not distinguished through the marker.
446 return ARGUMENTS_ADAPTOR; 446 return ARGUMENTS_ADAPTOR;
447 } else { 447 } else {
448 // The interpreter entry trampoline has a non-SMI marker. 448 // The interpreter entry trampoline has a non-SMI marker.
449 DCHECK(code_obj->is_interpreter_entry_trampoline()); 449 DCHECK(code_obj->is_interpreter_entry_trampoline() ||
450 code_obj->is_interpreter_enter_bytecode_dispatch());
450 return INTERPRETED; 451 return INTERPRETED;
451 } 452 }
452 } 453 }
453 break; // Marker encodes the frame type. 454 break; // Marker encodes the frame type.
454 case Code::HANDLER: 455 case Code::HANDLER:
455 if (!marker->IsSmi()) { 456 if (!marker->IsSmi()) {
456 // Only hydrogen code stub handlers can have a non-SMI marker. 457 // Only hydrogen code stub handlers can have a non-SMI marker.
457 DCHECK(code_obj->is_hydrogen_stub()); 458 DCHECK(code_obj->is_hydrogen_stub());
458 return OPTIMIZED; 459 return OPTIMIZED;
459 } 460 }
(...skipping 1156 matching lines...) Expand 10 before | Expand all | Expand 10 after
1616 for (StackFrameIterator it(isolate); !it.done(); it.Advance()) { 1617 for (StackFrameIterator it(isolate); !it.done(); it.Advance()) {
1617 StackFrame* frame = AllocateFrameCopy(it.frame(), zone); 1618 StackFrame* frame = AllocateFrameCopy(it.frame(), zone);
1618 list.Add(frame, zone); 1619 list.Add(frame, zone);
1619 } 1620 }
1620 return list.ToVector(); 1621 return list.ToVector();
1621 } 1622 }
1622 1623
1623 1624
1624 } // namespace internal 1625 } // namespace internal
1625 } // namespace v8 1626 } // namespace v8
OLDNEW
« no previous file with comments | « src/deoptimizer.cc ('k') | src/ia32/builtins-ia32.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698