Fix tests by removing broken (and unneeded) code from isolate_reload.cc

runtime/vm/isolate_reload.cc

 // Copyright (c) 2016, 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 "vm/isolate_reload.h"
 
 #include "vm/become.h"
 #include "vm/code_generator.h"
 #include "vm/compiler.h"
 #include "vm/dart_api_impl.h"
@@ skipping 638 matching lines @@
                   cls.ToCString(), cls2.ToCString(), new_cls.ToCString());
               UNREACHABLE();
             }
           }
         }
       }
     }
   }
   class_map.Release();
 }
-
-
-void IsolateReloadContext::VerifyCanonicalTypeArguments() {
-  Thread* thread = Thread::Current();
-  const Array& table =
-      Array::Handle(Z, I->object_store()->canonical_type_arguments());
-  const intptr_t table_size = table.Length() - 1;
-  ASSERT(Utils::IsPowerOfTwo(table_size));
-  TypeArguments& element = TypeArguments::Handle(Z);
-  TypeArguments& other_element = TypeArguments::Handle();
-  for (intptr_t i = 0; i < table_size; i++) {
-    element ^= table.At(i);
-    for (intptr_t j = 0; j < table_size; j++) {
-      if ((i != j) && (table.At(j) != TypeArguments::null())) {
-        other_element ^= table.At(j);
-        if (element.Equals(other_element)) {
-          // Recursive types may be equal, but have different hashes.
-          ASSERT(element.IsRecursive());
-          ASSERT(other_element.IsRecursive());
-          ASSERT(element.Hash() != other_element.Hash());
-        }
-      }
-    }
-  }
-}
 #endif
 
 
 void IsolateReloadContext::Commit() {
   TIMELINE_SCOPE(Commit);
   TIR_Print("---- COMMITTING REVERSE MAP\n");
 
 #ifdef DEBUG
   VerifyMaps();
 #endif
@@ skipping 108 matching lines @@
     const GrowableObjectArray& saved_libs =
         GrowableObjectArray::Handle(saved_libraries());
     const GrowableObjectArray& libs =
         GrowableObjectArray::Handle(I->object_store()->libraries());
     if (saved_libs.Length() != libs.Length()) {
      TIR_Print("Identity reload failed! B#L=%" Pd " A#L=%" Pd "\n",
                saved_libs.Length(),
                libs.Length());
     }
   }
-
-#ifdef DEBUG
-  // TODO(turnidge): Remove before committing to main branch.
-  VerifyCanonicalTypeArguments();
-#endif
 }
 
 
 bool IsolateReloadContext::IsDirty(const Library& lib) {
   const intptr_t index = lib.index();
   if (index == static_cast<classid_t>(-1)) {
     // Treat deleted libraries as dirty.
     return true;
   }
   ASSERT((index >= 0) && (index < library_infos_.length()));
@@ skipping 389 matching lines @@
         ASSERT(!super_cls.IsNull());
         super_cls.AddDirectSubclass(cls);
       }
     }
   }
 }
 
 #endif  // !PRODUCT
 
 }  // namespace dart