runtime/vm/deopt_instructions.cc - Issue 1107663002: Fix http://dartbug.com/23290

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: runtime/vm/deopt_instructions.cc

Issue 1107663002: Fix http://dartbug.com/23290 (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/

Patch Set: Created 5 years, 8 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:

Index: runtime/vm/deopt_instructions.cc

===================================================================

--- runtime/vm/deopt_instructions.cc (revision 45386)

+++ runtime/vm/deopt_instructions.cc (working copy)

@@ -783,10 +783,16 @@

// from the simulator.

ASSERT(Isolate::IsDeoptAfter(ret_address_instr->deopt_id()));

ASSERT(!object_table.IsNull());

- Function& function = Function::Handle();

+ Thread* thread = Thread::Current();

+ Zone* zone = thread->zone();

+ Function& function = Function::Handle(zone);

function ^= object_table.At(ret_address_instr->object_table_index());

ASSERT(code != NULL);

- Compiler::EnsureUnoptimizedCode(Thread::Current(), function);

+ const Error& error = Error::Handle(zone,

+ Compiler::EnsureUnoptimizedCode(thread, function));

+ if (!error.IsNull()) {

+ Exceptions::PropagateError(error);

+ }

*code ^= function.unoptimized_code();

ASSERT(!code->IsNull());

uword res = code->GetPcForDeoptId(ret_address_instr->deopt_id(),

« no previous file with comments | « runtime/vm/deferred_objects.cc ('k') | runtime/vm/flow_graph_inliner.cc » ('j') | no next file with comments »