languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-11-02 08:07:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Propagate UnhandledExceptionErrors returned by the tag handler in Reload

Browse source 
TBR=rmacnak

Review URL: https://codereview.chromium.org/2205573005 .
This commit is contained in:
John McCutchan 2016-08-02 19:08:45 -07:00
parent 35146c688e
commit a547fd531c
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
runtime/vm/isolate_reload.cc
View file

@ -490,10 +490,10 @@ void IsolateReloadContext::Reload(bool force_reload) {
// 6) The tag handler returns and we move on.
//
// Even after a successful reload the Dart code invoked in (5) can result
// in an Unwind error or a StackOverflow error. This error will be returned
// by the tag handler. The tag handler can return other errors, for example,
// top level parse errors. We want to capture these errors while propagating
// the Unwind or StackOverflow errors.
// in an Unwind error or an UnhandledException error. This error will be
// returned by the tag handler. The tag handler can return other errors,
// for example, top level parse errors. We want to capture these errors while
// propagating the UnwindError or an UnhandledException error.
Object& result = Object::Handle(thread->zone());
{
TransitionVMToNative transition(thread);
@ -511,9 +511,9 @@ void IsolateReloadContext::Reload(bool force_reload) {
BackgroundCompiler::Enable();
if (result.IsUnwindError() ||
(result.raw() == isolate()->object_store()->stack_overflow())) {
// When returning from the tag handler with an Unwind error or a
// StackOverflow error, propagate it and give up.
result.IsUnhandledException()) {
// If the tag handler returns with an UnwindError or an UnhandledException
// error, propagate it and give up.
Exceptions::PropagateError(Error::Cast(result));
UNREACHABLE();
}