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

Unified Diff: runtime/vm/compiler.cc

Issue 10365026: Fix mac debug build. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 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:
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: runtime/vm/compiler.cc
===================================================================
--- runtime/vm/compiler.cc (revision 7352)
+++ runtime/vm/compiler.cc (working copy)
@@ -243,7 +243,6 @@
static RawError* CompileFunctionHelper(const Function& function,
bool optimized) {
Isolate* isolate = Isolate::Current();
- Error& error = Error::Handle();
LongJump* base = isolate->long_jump_base();
LongJump jump;
isolate->set_long_jump_base(&jump);
@@ -323,13 +322,18 @@
OS::Print("%s", handlers.ToCString());
OS::Print("}\n");
}
+ isolate->set_long_jump_base(base);
+ return Error::null();
} else {
+ Error& error = Error::Handle();
// We got an error during compilation.
error = isolate->object_store()->sticky_error();
isolate->object_store()->clear_sticky_error();
+ isolate->set_long_jump_base(base);
+ return error.raw();
}
- isolate->set_long_jump_base(base);
- return error.raw();
+ UNREACHABLE();
+ return Error::null();
}
@@ -346,19 +350,23 @@
RawError* Compiler::CompileParsedFunction(
const ParsedFunction& parsed_function) {
Isolate* isolate = Isolate::Current();
- Error& error = Error::Handle();
LongJump* base = isolate->long_jump_base();
LongJump jump;
isolate->set_long_jump_base(&jump);
if (setjmp(*jump.Set()) == 0) {
CompileParsedFunctionHelper(parsed_function, false); // Non-optimized.
+ isolate->set_long_jump_base(base);
+ return Error::null();
} else {
+ Error& error = Error::Handle();
// We got an error during compilation.
error = isolate->object_store()->sticky_error();
isolate->object_store()->clear_sticky_error();
+ isolate->set_long_jump_base(base);
+ return error.raw();
}
- isolate->set_long_jump_base(base);
- return error.raw();
+ UNREACHABLE();
+ return Error::null();
}
@@ -382,7 +390,6 @@
RawObject* Compiler::ExecuteOnce(SequenceNode* fragment) {
Isolate* isolate = Isolate::Current();
- Object& result = Object::Handle();
LongJump* base = isolate->long_jump_base();
LongJump jump;
isolate->set_long_jump_base(&jump);
@@ -421,15 +428,21 @@
GrowableArray<const Object*> arguments; // no arguments.
const Array& kNoArgumentNames = Array::Handle();
+ Object& result = Object::Handle();
result = DartEntry::InvokeStatic(func,
arguments,
kNoArgumentNames);
+ isolate->set_long_jump_base(base);
+ return result.raw();
} else {
+ Object& result = Object::Handle();
result = isolate->object_store()->sticky_error();
isolate->object_store()->clear_sticky_error();
+ isolate->set_long_jump_base(base);
+ return result.raw();
}
- isolate->set_long_jump_base(base);
- return result.raw();
+ UNREACHABLE();
+ return Error::null();
siva 2012/05/05 00:11:15 Object::null()
regis 2012/05/05 00:24:09 Good point. I'll change it in my next cl.
}
« 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