runtime/vm/flow_graph_builder.cc - Issue 973103002: One more fix to async machinery (rethrow in finally, issue 22595).

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/flow_graph_builder.cc

Issue 973103002: One more fix to async machinery (rethrow in finally, issue 22595). (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/

Patch Set: Created 5 years, 10 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: runtime/vm/flow_graph_builder.cc

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

--- runtime/vm/flow_graph_builder.cc (revision 44187)

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

@@ -4098,12 +4098,11 @@

finally_block->Visit(&for_finally);

if (for_finally.is_open()) {

// Rethrow the exception. Manually build the graph for rethrow.

- // TODO(regis): This is not correct. Issue 22595.

Value* exception = for_finally.Bind(

- for_finally.BuildLoadLocal(catch_block->exception_var()));

+ for_finally.BuildLoadLocal(catch_block->rethrow_exception_var()));

for_finally.PushArgument(exception);

Value* stacktrace = for_finally.Bind(

- for_finally.BuildLoadLocal(catch_block->stacktrace_var()));

+ for_finally.BuildLoadLocal(catch_block->rethrow_stacktrace_var()));

for_finally.PushArgument(stacktrace);

for_finally.AddInstruction(

new(I) ReThrowInstr(catch_block->token_pos(), catch_handler_index));

« no previous file with comments | « runtime/vm/ast.h ('k') | runtime/vm/parser.h » ('j') | no next file with comments »