Make ClassFinalizer indifferent on whether we are generating a snapshot or not.

runtime/vm/dart_api_impl.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 "include/dart_api.h"
 
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
 #include "vm/dart.h"
@@ skipping 70 matching lines @@
 
 // Return error if isolate is in an inconsistent state.
 // Return NULL when no error condition exists.
 //
 // TODO(turnidge): Make this function return an error handle directly
 // rather than returning an error string.  The current behavior can
 // cause compilation errors to appear to be api errors.
 const char* CheckIsolateState(Isolate* isolate, bool generating_snapshot) {
   bool success = true;
   if (!ClassFinalizer::AllClassesFinalized()) {
-    success = (generating_snapshot) ?
-        ClassFinalizer::FinalizePendingClassesForSnapshotCreation() :
-        ClassFinalizer::FinalizePendingClasses();
+    ClassFinalizer class_finalizer(generating_snapshot);
+    success = class_finalizer.FinalizePendingClasses();
   }
   if (success) {
     success = isolate->object_store()->PreallocateObjects();
     if (success) {
       return NULL;
     }
   }
   // Make a copy of the error message as the original message string
   // may get deallocated when we return back from the Dart API call.
   const Error& err = Error::Handle(isolate->object_store()->sticky_error());
@@ skipping 3616 matching lines @@
                           RawScript::Kind kind,
                           Dart_Handle* result) {
   bool update_lib_status = (kind == RawScript::kScriptTag ||
                             kind == RawScript::kLibraryTag);
   if (update_lib_status) {
     lib.SetLoadInProgress();
   }
   const Script& script =
       Script::Handle(isolate, Script::New(url, source, kind));
   ASSERT(isolate != NULL);
-  const Error& error = Error::Handle(isolate, Compiler::Compile(lib, script));
+  const Error& error = Error::Handle(isolate, Compiler::Compile(
+      lib, script, ClassFinalizer::kNotGeneratingSnapshot));
   if (error.IsNull()) {
     *result = Api::NewHandle(isolate, lib.raw());
     if (update_lib_status) {
       lib.SetLoaded();
     }
   } else {
     *result = Api::NewHandle(isolate, error.raw());
     if (update_lib_status) {
       lib.SetLoadError();
     }
@@ skipping 381 matching lines @@
 DART_EXPORT void Dart_InitPerfEventsSupport(Dart_FileWriterFunction function) {
   Dart::set_perf_events_writer(function);
 }
 
 
 DART_EXPORT void Dart_InitFlowGraphPrinting(Dart_FileWriterFunction function) {
   Dart::set_flow_graph_writer(function);
 }
 
 }  // namespace dart