src/deoptimizer.cc - Issue 18356008: Remove special-casing of EAGER and SOFT deoptimization calling conventions, allowing calling addres…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: src/deoptimizer.cc

Issue 18356008: Remove special-casing of EAGER and SOFT deoptimization calling conventions, allowing calling addres… (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge

Patch Set: Rename needs_frame_is_call to needs_frame; fix calling convention for deopt on arm and mips so that… Created 7 years, 5 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

Index: src/deoptimizer.cc

diff --git a/src/deoptimizer.cc b/src/deoptimizer.cc

index f322e85b2119c962fe1a67518e1fa600d4a311cb..2ffaca9249f7fc927a8aea80e8e5fb9f117ad82b 100644

--- a/src/deoptimizer.cc

+++ b/src/deoptimizer.cc

@@ -542,6 +542,7 @@ Deoptimizer::Deoptimizer(Isolate* isolate,

if (function->IsSmi()) {

function = NULL;

}

+ ASSERT(from != NULL);

if (function != NULL && function->IsOptimized()) {

function->shared()->increment_deopt_count();

if (bailout_type_ == Deoptimizer::SOFT) {

@@ -573,8 +574,6 @@ Code* Deoptimizer::FindOptimizedCode(JSFunction* function,

switch (bailout_type_) {

case Deoptimizer::SOFT:

case Deoptimizer::EAGER:

- ASSERT(from_ == NULL);

- return function->code();

case Deoptimizer::LAZY: {

Code* compiled_code =

isolate_->deoptimizer_data()->FindDeoptimizingCode(from_);

« no previous file with comments | « src/arm/lithium-codegen-arm.cc ('k') | src/ia32/deoptimizer-ia32.cc » ('j') | no next file with comments »