Add Dart_PropagateError.

runtime/vm/parser.cc

Index: runtime/vm/parser.cc
===================================================================
--- runtime/vm/parser.cc	(revision 3415)
+++ runtime/vm/parser.cc	(working copy)
@@ -99,9 +99,9 @@
 
 
 static ThrowNode* CreateEvalConstConstructorThrow(intptr_t token_pos,
-                                                  const Instance& instance) {
+                                                  const Object& obj) {
   UnhandledException& excp = UnhandledException::Handle();
-  excp ^= instance.raw();
+  excp ^= obj.raw();
   const Instance& exception = Instance::ZoneHandle(excp.exception());
   const Instance& stack_trace = Instance::ZoneHandle(excp.stacktrace());
   return new ThrowNode(token_pos,
@@ -228,6 +228,7 @@
 
 void Parser::ParseCompilationUnit(const Library& library,
                                   const Script& script) {
+  ASSERT(Isolate::Current()->long_jump_base()->IsSafeToJump());
   Parser parser(script, library);
   if (FLAG_compiler_stats) {
     CompilerStats::parser_timer.Start();
@@ -557,6 +558,7 @@
 
 void Parser::ParseFunction(ParsedFunction* parsed_function) {
   Isolate* isolate = Isolate::Current();
+  ASSERT(isolate->long_jump_base()->IsSafeToJump());
   // Compilation can be nested, preserve the ast node id.
   const int prev_ast_node_id = isolate->ast_node_id();
   isolate->set_ast_node_id(0);
@@ -6360,20 +6362,29 @@
                                                  Resolver::kIsQualified));
     ASSERT(!func.IsNull());
     ASSERT(func.kind() == RawFunction::kConstImplicitGetter);
-    Instance& const_value = Instance::Handle(
+    Object& const_value = Object::Handle(
         DartEntry::InvokeStatic(func, arguments, kNoArgumentNames));
-    if (const_value.IsUnhandledException()) {
-      ErrorMsg("exception thrown in Parser::RunStaticFieldInitializer");
+    if (const_value.IsError()) {
+      if (const_value.IsUnhandledException()) {
+        ErrorMsg("exception thrown in Parser::RunStaticFieldInitializer");
+      } else {
+        Error& error = Error::Handle();
+        error ^= const_value.raw();
+        Isolate::Current()->long_jump_base()->Jump(1, error);
+      }
     }
-    if (!const_value.IsNull()) {
-      const_value ^= const_value.Canonicalize();
+    ASSERT(const_value.IsNull() || const_value.IsInstance());
+    Instance& instance = Instance::Handle();
+    instance ^= const_value.raw();
+    if (!instance.IsNull()) {
+      instance ^= instance.Canonicalize();
     }
-    field.set_value(const_value);
+    field.set_value(instance);
   }
 }
 
 
-RawInstance* Parser::EvaluateConstConstructorCall(
+RawObject* Parser::EvaluateConstConstructorCall(
     const Class& type_class,
     const AbstractTypeArguments& type_arguments,
     const Function& constructor,
@@ -6404,20 +6415,27 @@
     arg_values.Add(&arg->AsLiteralNode()->literal());
   }
   const Array& opt_arg_names = arguments->names();
-  const Instance& result = Instance::Handle(
+  const Object& result = Object::Handle(
       DartEntry::InvokeStatic(constructor, arg_values, opt_arg_names));
-  if (result.IsUnhandledException()) {
-    instance = result.raw();
+  if (result.IsError()) {
+      if (result.IsUnhandledException()) {
+        return result.raw();
+      } else {
+        Error& error = Error::Handle();
+        error ^= result.raw();
+        Isolate::Current()->long_jump_base()->Jump(1, error);
+        UNREACHABLE();
+      }
   } else {
     if (constructor.IsFactory()) {
       // The factory method returns the allocated object.
-      instance = result.raw();
+      instance ^= result.raw();
     }
     if (!instance.IsNull()) {
       instance ^= instance.Canonicalize();
     }
+    return instance.raw();
   }
-  return instance.raw();
 }
 
 
@@ -7049,14 +7067,16 @@
     const Function& map_constr = Function::ZoneHandle(
         immutable_map_class.LookupConstructor(constr_name));
     ASSERT(!map_constr.IsNull());
-    const Instance& const_instance = Instance::ZoneHandle(
+    const Object& constructor_result = Object::ZoneHandle(

[siva, 2012/01/31 00:52:34]

Why does this have to be a ZoneHandle?

[turnidge, 2012/01/31 21:56:31]

I was cribbing code here.  Fixed.

         EvaluateConstConstructorCall(immutable_map_class,
                                      map_type_arguments,
                                      map_constr,
                                      constr_args));
-    if (const_instance.IsUnhandledException()) {
-      return CreateEvalConstConstructorThrow(literal_pos, const_instance);
+    if (constructor_result.IsUnhandledException()) {
+      return CreateEvalConstConstructorThrow(literal_pos, constructor_result);
     } else {
+      Instance& const_instance = Instance::ZoneHandle();
+      const_instance ^= constructor_result.raw();
       return new LiteralNode(literal_pos, const_instance);
     }
   } else {
@@ -7301,14 +7321,16 @@
       ErrorMsg("'const' requires const constructor: '%s'",
           String::Handle(constructor.name()).ToCString());
     }
-    const Instance& const_instance = Instance::ZoneHandle(
+    const Object& constructor_result = Object::ZoneHandle(

[siva, 2012/01/31 00:52:34]

Ditto...

[turnidge, 2012/01/31 21:56:31]

Fixed.

         EvaluateConstConstructorCall(type_class,
                                      type_arguments,
                                      constructor,
                                      arguments));
-    if (const_instance.IsUnhandledException()) {
-      new_object = CreateEvalConstConstructorThrow(new_pos, const_instance);
+    if (constructor_result.IsUnhandledException()) {
+      new_object = CreateEvalConstConstructorThrow(new_pos, constructor_result);
     } else {
+      Instance& const_instance = Instance::ZoneHandle();
+      const_instance ^= constructor_result.raw();
       new_object = new LiteralNode(new_pos, const_instance);
     }
   } else {
@@ -7518,7 +7540,17 @@
     SequenceNode* seq = new SequenceNode(expr->token_index(), empty_scope);
     seq->Add(ret);
 
-    Instance& value = Instance::ZoneHandle(Compiler::ExecuteOnce(seq));
+    Object& result = Object::ZoneHandle(Compiler::ExecuteOnce(seq));

[siva, 2012/01/31 00:52:34]

Ditto.

[turnidge, 2012/01/31 21:56:31]

Fixed.  Also changed for Error below.

+    if (result.IsError()) {
+      // Propagate the compilation error.
+      Error& error = Error::ZoneHandle();
+      error ^= result.raw();
+      Isolate::Current()->long_jump_base()->Jump(1, error);
+      UNREACHABLE();
+    }
+    ASSERT(result.IsInstance());
+    Instance& value = Instance::ZoneHandle();
+    value ^= result.raw();
     if (value.IsNull()) {
       value ^= value.Canonicalize();
     }