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

Unified Diff: vm/class_finalizer.cc

Issue 8361017: Fix intermittent simarm build breakage on macos. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/runtime/
Patch Set: '' Created 9 years, 2 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: vm/class_finalizer.cc
===================================================================
--- vm/class_finalizer.cc (revision 590)
+++ vm/class_finalizer.cc (working copy)
@@ -511,7 +511,6 @@
RawString* ClassFinalizer::FinalizeTypeWhileParsing(const Type& type) {
- String& msg = String::Handle();
Isolate* isolate = Isolate::Current();
ASSERT(isolate != NULL);
LongJump* base = isolate->long_jump_base();
@@ -519,12 +518,15 @@
isolate->set_long_jump_base(&jump);
if (setjmp(*jump.Set()) == 0) {
FinalizeType(type);
+ isolate->set_long_jump_base(base);
+ return String::null();
} else {
// Error occured: Get the error message.
- msg = isolate->object_store()->sticky_error();
+ isolate->set_long_jump_base(base);
+ return isolate->object_store()->sticky_error();
}
- isolate->set_long_jump_base(base);
- return msg.raw();
+ UNREACHABLE();
+ return String::null();
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698