commit a2dfa75371d9f1924bfd467dbf6ca37f78b88c63
author Daco Harkes <dacoharkes@google.com> Thu Nov 15 10:30:19 2018 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org> Thu Nov 15 10:30:19 2018 +0000
tree e851127f7ffb40f2985bca2dfc64269e19296821
parent 4ae585ce861118d382888d68910ec9ac88488afe

[vm] Fix TypeParameter skipping logic in KernelLoader::LoadClass

Change-Id: I578b2f81a58c116a4e5bb8b846040481ba3dd270
Reviewed-on: https://dart-review.googlesource.com/c/84426
Commit-Queue: Daco Harkes <dacoharkes@google.com>
Reviewed-by: Vyacheslav Egorov <vegorov@google.com>

runtime/vm/kernel_loader.cc

diff --git a/runtime/vm/kernel_loader.cc b/runtime/vm/kernel_loader.cc
index 7118a36..6a818a9 100644
--- a/runtime/vm/kernel_loader.cc
+++ b/runtime/vm/kernel_loader.cc
@@ -1279,10 +1279,8 @@
   if (!out_class->is_cycle_free()) {
     LoadPreliminaryClass(&class_helper, type_parameter_counts);
   } else {
-    for (intptr_t i = 0; i < type_parameter_counts; ++i) {
-      helper_.SkipStringReference();  // read ith name index.
-      helper_.SkipDartType();         // read ith bound.
-    }
+    // do not use type parameters with cycle_free
+    ASSERT(type_parameter_counts == 0);
     class_helper.SetJustRead(ClassHelper::kTypeParameters);
   }