VM: Fix initialization of statics in presence of exceptions.

runtime/vm/object.h

 // 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.
 
 #ifndef VM_OBJECT_H_
 #define VM_OBJECT_H_
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/utils.h"
@@ skipping 1505 matching lines @@
 
   RawCode* closure_allocation_stub() const;
   void set_closure_allocation_stub(const Code& value) const;
 
   void set_extracted_method_closure(const Function& function) const;
   RawFunction* extracted_method_closure() const;
 
   void set_saved_args_desc(const Array& array) const;
   RawArray* saved_args_desc() const;
 
+  void set_saved_static_field(const Field& array) const;
+  RawField* saved_static_field() const;
+
   bool IsMethodExtractor() const {
     return kind() == RawFunction::kMethodExtractor;
   }
 
   bool IsNoSuchMethodDispatcher() const {
     return kind() == RawFunction::kNoSuchMethodDispatcher;
   }
 
   bool IsInvokeFieldDispatcher() const {
     return kind() == RawFunction::kInvokeFieldDispatcher;
@@ skipping 333 matching lines @@
   // Allocates a new Function object representing a closure function, as well as
   // a new associated Class object representing the signature class of the
   // function.
   // The function and the class share the same given name.
   static RawFunction* NewClosureFunction(const String& name,
                                          const Function& parent,
                                          intptr_t token_pos);
 
   // Creates a new static initializer function which is invoked in the implicit
   // static getter function.
-  static RawFunction* NewStaticInitializer(const String& field_name,
-                                           const AbstractType& result_type,
-                                           const Class& cls,
-                                           intptr_t token_pos);
+  static RawFunction* NewStaticInitializer(const Field& field);
 
   // Allocate new function object, clone values from this function. The
   // owner of the clone is new_owner.
   RawFunction* Clone(const Class& new_owner) const;
 
   // Slow function, use in asserts to track changes in important library
   // functions.
   int32_t SourceFingerprint() const;
 
   // Return false and report an error if the fingerprint does not match.
@@ skipping 4417 matching lines @@
 
 
 RawObject* MegamorphicCache::GetTargetFunction(const Array& array,
                                                intptr_t index) {
   return array.At((index * kEntryLength) + kTargetFunctionIndex);
 }
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_H_