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 67 matching lines @@
     }                                                                          \
   } while (0)
 
 
 // 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();
-  }
-  if (success) {
-    success = isolate->object_store()->PreallocateObjects();
-    if (success) {
-      return NULL;
-    }
+const char* CheckIsolateState(Isolate* isolate) {
+  if (ClassFinalizer::FinalizePendingClasses() &&
+      isolate->object_store()->PreallocateObjects()) {
+    // 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());
   const char* errmsg = err.ToErrorCString();
   intptr_t errlen = strlen(errmsg) + 1;
   char* msg = Api::TopScope(isolate)->zone()->Alloc<char>(errlen);
   OS::SNPrint(msg, errlen, "%s", errmsg);
   return msg;
 }
@@ skipping 699 matching lines @@
                                             intptr_t* size) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   TIMERSCOPE(time_creating_snapshot);
   if (buffer == NULL) {
     RETURN_NULL_ERROR(buffer);
   }
   if (size == NULL) {
     RETURN_NULL_ERROR(size);
   }
-  const char* msg = CheckIsolateState(isolate,
-                                      ClassFinalizer::kGeneratingSnapshot);
+  const char* msg = CheckIsolateState(isolate);
   if (msg != NULL) {
     return Api::NewError(msg);
   }
   // Since this is only a snapshot the root library should not be set.
   isolate->object_store()->set_root_library(Library::Handle(isolate));
   SnapshotWriter writer(Snapshot::kFull, buffer, ApiReallocate);
   writer.WriteFullSnapshot();
   *size = writer.BytesWritten();
   return Api::Success(isolate);
 }
@@ skipping 3305 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