[vm/bytecode] Replace dynamic with Object in bounds of type parameters

alexmarkov · commit-bot@chromium.org · commit 3f4ccc1076a7 · 2019-08-07T22:42:55.000Z
This is needed for function subtype checks and mimics the behavior of kernel AST reader (TypeTranslator::LoadAndSetupTypeParameters). Fixes the following tests in bytecode mode: co19_2/Language/Generics/typedef_A04_t06 co19_2/Language/Generics/typedef_A04_t07 Change-Id: I70fc86e811e77b2adc31d7bfce9ba55c5838666f Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/112144 Reviewed-by: Régis Crelier <regis@google.com> Commit-Queue: Alexander Markov <alexmarkov@google.com>
diff --git a/runtime/vm/compiler/frontend/bytecode_reader.cc b/runtime/vm/compiler/frontend/bytecode_reader.cc
@@ -674,6 +674,13 @@ void BytecodeReaderHelper::ReadTypeParametersDeclaration(
   for (intptr_t i = 0; i < num_type_params; ++i) {
     parameter ^= type_parameters.TypeAt(i);
     bound ^= ReadObject();
+    // Convert dynamic to Object in bounds of type parameters so
+    // they are equivalent when doing subtype checks for function types.
+    // TODO(https://github.com/dart-lang/language/issues/495): revise this
+    // when function subtyping is fixed.
+    if (bound.IsDynamicType()) {
+      bound = I->object_store()->object_type();
+    }
     parameter.set_bound(bound);
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -674,6 +674,13 @@ void BytecodeReaderHelper::ReadTypeParametersDeclaration(`
`674`	`674`	`for (intptr_t i = 0; i < num_type_params; ++i) {`
`675`	`675`	`parameter ^= type_parameters.TypeAt(i);`
`676`	`676`	`bound ^= ReadObject();`
	`677`	`+ // Convert dynamic to Object in bounds of type parameters so`
	`678`	`+ // they are equivalent when doing subtype checks for function types.`
	`679`	`+ // TODO(https://github.com/dart-lang/language/issues/495): revise this`
	`680`	`+ // when function subtyping is fixed.`
	`681`	`+ if (bound.IsDynamicType()) {`
	`682`	`+ bound = I->object_store()->object_type();`
	`683`	`+ }`
`677`	`684`	`parameter.set_bound(bound);`
`678`	`685`	`}`
`679`	`686`	`}`