1. Fix the type arguments recursion problem that gets introduced when canonicalization of type argu…

runtime/vm/snapshot_test.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 "platform/globals.h"
 
 #include "include/dart_tools_api.h"
 #include "platform/assert.h"
 #include "vm/class_finalizer.h"
 #include "vm/dart_api_impl.h"
@@ skipping 1037 matching lines @@
 
   // Check if we are able to generate the source from the token stream.
   // Rescan this source and compare the token stream to see if they are
   // the same.
   GenerateSourceAndCheck(serialized_script);
 
   free(buffer);
 }
 
 
-#if 0
 UNIT_TEST_CASE(CanonicalizationInScriptSnapshots) {
   const char* kScriptChars =
       "\n"
       "import 'dart:mirrors';"
       "import 'dart:isolate';"
       "void main() {"
       "  if (reflectClass(MyException).superclass.reflectedType != "
       "      IsolateSpawnException) {"
       "    throw new Exception('Canonicalization failure');"
       "  }"
@@ skipping 90 matching lines @@
 
     // Invoke a function which returns an object.
     result = Dart_Invoke(result, NewString("main"), 0, NULL);
     EXPECT_VALID(result);
     Dart_ExitScope();
     Dart_ShutdownIsolate();
   }
   free(script_snapshot);
   free(full_snapshot);
 }
-#endif
 
 
 static void IterateScripts(const Library& lib) {
   const Array& lib_scripts = Array::Handle(lib.LoadedScripts());
   Script& script = Script::Handle();
   String& uri = String::Handle();
   for (intptr_t i = 0; i < lib_scripts.Length(); i++) {
     script ^= lib_scripts.At(i);
     EXPECT(!script.IsNull());
     uri = script.url();
@@ skipping 1875 matching lines @@
   StackZone zone(Isolate::Current());
   uint8_t* buffer;
   MessageWriter writer(&buffer, &zone_allocator, true);
   writer.WriteInlinedObjectHeader(kOmittedObjectId);
   // For performance, we'd like single-byte headers when ids are omitted.
   // If this starts failing, consider renumbering the snapshot ids.
   EXPECT_EQ(1, writer.BytesWritten());
 }
 
 }  // namespace dart