Fix for issue 19817

runtime/vm/benchmark_test.cc

Index: runtime/vm/benchmark_test.cc
===================================================================
--- runtime/vm/benchmark_test.cc	(revision 38470)
+++ runtime/vm/benchmark_test.cc	(working copy)
@@ -153,12 +153,16 @@
 
   Dart_Handle lib = TestCase::LoadTestScript(
       kScriptChars,
-      reinterpret_cast<Dart_NativeEntryResolver>(bm_uda_lookup));
+      reinterpret_cast<Dart_NativeEntryResolver>(bm_uda_lookup),
+      USER_TEST_URI,
+      false);
 
   // Create a native wrapper class with native fields.
   Dart_Handle result = Dart_CreateNativeWrapperClass(
       lib, NewString("NativeFieldsWrapper"), 1);
   EXPECT_VALID(result);
+  result = Dart_FinalizeLoading(false);
+  EXPECT_VALID(result);
 
   Dart_Handle args[1];
   args[0] = Dart_NewInteger(kNumIterations);
@@ -411,7 +415,7 @@
   // Need to load the script into the dart: core library due to
   // the import of dart:_internal.
   TestCase::LoadCoreTestScript(kScriptChars, NULL);
-  Api::CheckIsolateState(Isolate::Current());
+  Api::CheckAndFinalizePendingClasses(Isolate::Current());
 
   // Write snapshot with object content.
   FullSnapshotWriter writer(&buffer, &malloc_allocator);
@@ -442,7 +446,7 @@
   // Need to load the script into the dart: core library due to
   // the import of dart:_internal.
   TestCase::LoadCoreTestScript(kScriptChars, NULL);
-  Api::CheckIsolateState(Isolate::Current());
+  Api::CheckAndFinalizePendingClasses(Isolate::Current());
 
   // Write snapshot with object content.
   FullSnapshotWriter writer(&buffer, &malloc_allocator);
@@ -478,7 +482,7 @@
       "\n";
   const intptr_t kLoopCount = 1000000;
   TestCase::LoadTestScript(kScriptChars, NULL);
-  Api::CheckIsolateState(Isolate::Current());
+  Api::CheckAndFinalizePendingClasses(Isolate::Current());
   Dart_Isolate isolate = Dart_CurrentIsolate();
   Timer timer(true, "Enter and Exit isolate");
   timer.Start();