commit 701c06d033b9b4f7440eaf3f586cb829d41c9970
author Alexander Aprelev <aam@google.com> Mon Apr 19 19:57:08 2021 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org> Mon Apr 19 19:57:08 2021 +0000
tree 670cc8220e15ba4acab91b1f285c5b632beede81
parent 77466f2b83e9c8467b2711c906770658759062ad

[vm/reload] Do class reload type parameter count check before finalization.

Fixes https://github.com/dart-lang/sdk/issues/45602

TEST=pkg/vm/test/incremental_compiler_test.dart

Change-Id: Iebf64c4d7ca8ba42209de27fe35ab1e03302d308
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/195305
Reviewed-by: Régis Crelier <regis@google.com>
Commit-Queue: Alexander Aprelev <aam@google.com>

runtime/vm/object_reload.cc

diff --git a/runtime/vm/object_reload.cc b/runtime/vm/object_reload.cc
index 0a8c71f..e075887 100644
--- a/runtime/vm/object_reload.cc
+++ b/runtime/vm/object_reload.cc
@@ -657,6 +657,17 @@
   }
 
   if (is_finalized()) {
+    // Make sure the declaration types parameter count matches for the two
+    // classes.
+    // ex. class A<int,B> {} cannot be replace with class A<B> {}.
+    auto group_context = context->group_reload_context();
+    if (NumTypeParameters() != replacement.NumTypeParameters()) {
+      group_context->AddReasonForCancelling(
+          new (context->zone())
+              TypeParametersChanged(context->zone(), *this, replacement));
+      return;
+    }
+
     // Ensure the replacement class is also finalized.
     const Error& error =
         Error::Handle(replacement.EnsureIsFinalized(Thread::Current()));