Index: runtime/vm/isolate.cc |
=================================================================== |
--- runtime/vm/isolate.cc (revision 3862) |
+++ runtime/vm/isolate.cc (working copy) |
@@ -358,8 +358,7 @@ |
-RawObject* Isolate::StandardRunLoop() { |
- ASSERT(long_jump_base() != NULL); |
+RawError* Isolate::StandardRunLoop() { |
ASSERT(message_notify_callback() == NULL); |
ASSERT(message_handler() != NULL); |
@@ -383,14 +382,16 @@ |
message->dest_port(), message->reply_port(), msg)); |
delete message; |
if (result.IsError()) { |
- return result.raw(); |
+ Error& error = Error::Handle(); |
+ error ^= result.raw(); |
+ return error.raw(); |
} |
ASSERT(result.IsNull()); |
} |
} |
// Indicates success. |
- return Object::null(); |
+ return Error::null(); |
} |