VM: Fix initialization of statics in presence of exceptions.

runtime/vm/class_finalizer.cc

Index: runtime/vm/class_finalizer.cc
===================================================================
--- runtime/vm/class_finalizer.cc	(revision 29680)
+++ runtime/vm/class_finalizer.cc	(working copy)
@@ -1220,17 +1220,11 @@
           field.set_value(Instance::Handle(Object::sentinel().raw()));
 
           // Create initializer function.
-          // We don't have the start position of the initializer expression
-          // here, but can compute it from the field identifier position:
-          // The initializer expression starts after the assignment token at +2.
-          const intptr_t initializer_pos = field.token_pos() + 2;
-          const Function& init_function = Function::ZoneHandle(
-              Function::NewStaticInitializer(
-                  String::Handle(field.name()),
-                  type,
-                  cls,
-                  initializer_pos));
-          cls.AddFunction(init_function);
+          if (!field.is_const()) {
+            const Function& init_function = Function::ZoneHandle(
+                Function::NewStaticInitializer(field));

[Florian Schneider, 2013/11/01 12:43:48]

This addresses your comment to my previous CL: I now store the token position of
the field with the initializer function. When parsing the initializer function,
I simply skip ahead over the field identifier and the = token to the initializer
expression. No idea why I didn't do that in the first place.

+            cls.AddFunction(init_function);
+          }
         }
       }
     }