Fix class patching involving type parameters: type parameters of patched classes

runtime/vm/snapshot_test.cc

Index: runtime/vm/snapshot_test.cc
===================================================================
--- runtime/vm/snapshot_test.cc	(revision 17960)
+++ runtime/vm/snapshot_test.cc	(working copy)
@@ -929,15 +929,17 @@
   {
     TestIsolateScope __test_isolate__;
 
+    Isolate* isolate = Isolate::Current();
+    StackZone zone(isolate);
+    HandleScope scope(isolate);
+
     // Create a test library and Load up a test script in it.
     TestCase::LoadTestScript(kScriptChars, NULL);
+    EXPECT_STREQ("", CheckIsolateState(isolate));
     timer1.Stop();
     OS::PrintErr("Without Snapshot: %"Pd64"us\n", timer1.TotalElapsedTime());
 
     // Write snapshot with object content.
-    Isolate* isolate = Isolate::Current();
-    StackZone zone(isolate);
-    HandleScope scope(isolate);
     FullSnapshotWriter writer(&buffer, &malloc_allocator);
     writer.WriteFullSnapshot();
   }
@@ -987,7 +989,7 @@
 
     // Create a test library and Load up a test script in it.
     Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
-    ClassFinalizer::FinalizePendingClasses();
+    EXPECT_STREQ("", CheckIsolateState(isolate));
     timer1.Stop();
     OS::PrintErr("Without Snapshot: %"Pd64"us\n", timer1.TotalElapsedTime());
 
@@ -1104,6 +1106,7 @@
     EXPECT_VALID(Dart_LibraryImportLibrary(TestCase::lib(),
                                            import_lib,
                                            Dart_Null()));
+    EXPECT_STREQ("", CheckIsolateState(Isolate::Current()));
 
     // Get list of library URLs loaded and save the count.
     Dart_Handle libs = Dart_GetLibraryURLs();