- Ensure that classes are finalized before their description is

runtime/vm/compiler.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/compiler.h"
 
 #include "vm/assembler.h"
 
 #include "vm/ast_printer.h"
 #include "vm/block_scheduler.h"
@@ skipping 137 matching lines @@
 
 RawError* Compiler::CompileClass(const Class& cls) {
   // If class is a top level class it is already parsed.
   if (cls.IsTopLevel()) {
     return Error::null();
   }
   // If the class is already marked for parsing return immediately.
   if (cls.is_marked_for_parsing()) {
     return Error::null();
   }
+
+  Isolate* isolate = Isolate::Current();
+  // We remember all the classes that are being compiled in these lists. This
+  // also allows us to reset the marked_for_parsing state in case we see an
+  // error.
+  Class& parse_class = Class::Handle();
+  const GrowableObjectArray& parse_list =
+      GrowableObjectArray::Handle(GrowableObjectArray::New(4));
+  const GrowableObjectArray& patch_list =
+      GrowableObjectArray::Handle(GrowableObjectArray::New(4));
+
   // Parse the class and all the interfaces it implements and super classes.
-  Isolate* isolate = Isolate::Current();
   StackZone zone(isolate);
   LongJump* base = isolate->long_jump_base();
   LongJump jump;
   isolate->set_long_jump_base(&jump);
   if (setjmp(*jump.Set()) == 0) {
     if (FLAG_trace_compiler) {
       OS::Print("Compiling Class %s '%s'\n", "", cls.ToCString());
     }
 
-    Class& parse_class = Class::Handle();
-    const GrowableObjectArray& parse_list =
-        GrowableObjectArray::Handle(GrowableObjectArray::New(4));
-    const GrowableObjectArray& patch_list =
-        GrowableObjectArray::Handle(GrowableObjectArray::New(4));
-
     // Add the primary class which needs to be parsed to the parse list.
     // Mark the class as parsed so that we don't recursively add the same
     // class back into the list.
     parse_list.Add(cls);
     cls.set_is_marked_for_parsing();
 
     // Add all super classes, interface classes and patch class if one
     // exists to the corresponding lists.
     // NOTE: The parse_list array keeps growing as more classes are added
     // to it by AddRelatedClassesToList. It is not OK to hoist
@@ skipping 22 matching lines @@
     for (intptr_t i = (parse_list.Length() - 1); i >=0 ; i--) {
       parse_class ^= parse_list.At(i);
       ASSERT(!parse_class.IsNull());
       ClassFinalizer::FinalizeClass(parse_class);
       parse_class.reset_is_marked_for_parsing();
     }
 
     isolate->set_long_jump_base(base);
     return Error::null();
   } else {
+    // Reset the marked for parsing flags.
+    for (intptr_t i = 0; i < parse_list.Length(); i++) {
+      parse_class ^= parse_list.At(i);
+      if (parse_class.is_marked_for_parsing()) {
+        parse_class.reset_is_marked_for_parsing();
+      }
+    }
+    for (intptr_t i = 0; i < patch_list.Length(); i++) {
+      parse_class ^= patch_list.At(i);
+      if (parse_class.is_marked_for_parsing()) {
+        parse_class.reset_is_marked_for_parsing();
+      }
+    }
+
     Error& error = Error::Handle();
     error = isolate->object_store()->sticky_error();
     isolate->object_store()->clear_sticky_error();
     isolate->set_long_jump_base(base);
     return error.raw();
   }
   UNREACHABLE();
   return Error::null();
 }
 
@@ skipping 701 matching lines @@
       Object::Handle(isolate->object_store()->sticky_error());
     isolate->object_store()->clear_sticky_error();
     isolate->set_long_jump_base(base);
     return result.raw();
   }
   UNREACHABLE();
   return Object::null();
 }
 
 }  // namespace dart