VM: Fix initialization of statics in presence of exceptions.

runtime/vm/object.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/cpu.h"
@@ skipping 4184 matching lines @@
 
 
 void Function::set_saved_args_desc(const Array& value) const {
   ASSERT(kind() == RawFunction::kNoSuchMethodDispatcher ||
          kind() == RawFunction::kInvokeFieldDispatcher);
   ASSERT(raw_ptr()->data_ == Object::null());
   set_data(value);
 }
 
 
+RawField* Function::saved_static_field() const {
+  ASSERT(kind() == RawFunction::kStaticInitializer);
+  const Object& obj = Object::Handle(raw_ptr()->data_);
+  ASSERT(obj.IsField());
+  return Field::Cast(obj).raw();
+}
+
+
+void Function::set_saved_static_field(const Field& value) const {
+  ASSERT(kind() == RawFunction::kStaticInitializer);
+  ASSERT(raw_ptr()->data_ == Object::null());
+  set_data(value);
+}
+
+
 RawFunction* Function::parent_function() const {
   if (IsClosureFunction()) {
     const Object& obj = Object::Handle(raw_ptr()->data_);
     ASSERT(!obj.IsNull());
     return ClosureData::Cast(obj).parent_function();
   }
   return Function::null();
 }
 
 
@@ skipping 1207 matching lines @@
                 ToFullyQualifiedCString(),
                 fp,
                 SourceFingerprint());
       return false;
     }
   }
   return true;
 }
 
 
-RawFunction* Function::NewStaticInitializer(const String& field_name,
-                                            const AbstractType& result_type,
-                                            const Class& cls,
-                                            intptr_t initializer_pos) {
+RawFunction* Function::NewStaticInitializer(const Field& field) {
+  ASSERT(field.is_static());
+  const String& field_name = String::Handle(field.name());
   const String& init_name =
       String::Handle(Symbols::New(String::Handle(
           String::Concat(Symbols::InitPrefix(), field_name))));
   const Function& init_function = Function::ZoneHandle(
       Function::New(init_name,
                     RawFunction::kStaticInitializer,
                     true,  // static
                     false,  // !const
                     false,  // !abstract
                     false,  // !external
-                    cls,
-                    initializer_pos));
-  init_function.set_result_type(result_type);
+                    Class::Handle(field.owner()),
+                    field.token_pos()));
+  init_function.set_result_type(AbstractType::Handle(field.type()));
   // Static initializer functions are generated by the VM and are therfore
   // hidden from the user. Since they are only executed once, we avoid
   // optimizing and inlining them. After the field is initialized, the
   // optimizing compiler can eliminate the call to the static initializer
   // via constant folding.
   init_function.set_is_visible(false);
   init_function.set_is_optimizable(false);
   init_function.set_is_inlinable(false);
+  init_function.set_saved_static_field(field);
   return init_function.raw();
 }
 
 
 const char* Function::ToCString() const {
   const char* static_str = is_static() ? " static" : "";
   const char* abstract_str = is_abstract() ? " abstract" : "";
   const char* kind_str = NULL;
   const char* const_str = is_const() ? " const" : "";
   switch (kind()) {
@@ skipping 10167 matching lines @@
   return "_MirrorReference";
 }
 
 
 void MirrorReference::PrintToJSONStream(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
 }
 
 
 }  // namespace dart