Fix assert in app-jit where heap verifier finds ICData

runtime/vm/dart_api_impl.cc

 // Copyright (c) 2013, 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 "include/dart_mirrors_api.h"
 #include "include/dart_native_api.h"
 
 #include "platform/assert.h"
 #include "lib/stacktrace.h"
@@ skipping 6590 matching lines @@
     }
   }
 
   js_stream.Steal(reinterpret_cast<char**>(buffer), buffer_length);
   return Api::Success();
 #endif
 }
 
 DART_EXPORT void Dart_SortClasses() {
   DARTSCOPE(Thread::Current());
+  // We don't have mechanisms to change class-ids that are embedded in code and
+  // ICData.
+  ClassFinalizer::ClearAllCode();
+  // Make sure that ICData etc. that have been cleared are also removed from
+  // the heap so that they are not found by the heap verifier.
+  Isolate::Current()->heap()->CollectAllGarbage();
   ClassFinalizer::SortClasses();
-  ClassFinalizer::ClearAllCode();
 }
 
 DART_EXPORT Dart_Handle
 Dart_Precompile(Dart_QualifiedFunctionName entry_points[],
                 uint8_t* jit_feedback,
                 intptr_t jit_feedback_length) {
 #if defined(TARGET_ARCH_IA32)
   return Api::NewError("AOT compilation is not supported on IA32.");
 #elif defined(TARGET_ARCH_DBC)
   return Api::NewError("AOT compilation is not supported on DBC.");
@@ skipping 208 matching lines @@
 }
 
 
 DART_EXPORT void Dart_DumpNativeStackTrace(void* context) {
 #ifndef PRODUCT
   Profiler::DumpStackTrace(context);
 #endif
 }
 
 }  // namespace dart