Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(596)

Unified Diff: runtime/vm/parser.cc

Issue 1674383002: Keep a trail while checking upper bounds in the VM in order to properly handle (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: address comments Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/object.cc ('k') | tests/language/regress_25568_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/parser.cc
diff --git a/runtime/vm/parser.cc b/runtime/vm/parser.cc
index 9ebd0ce6acaf07aa110963d69ace3d25c3960663..a234be8dab761bad1e269d0c56ce8bcba0fff3f0 100644
--- a/runtime/vm/parser.cc
+++ b/runtime/vm/parser.cc
@@ -13221,7 +13221,11 @@ void Parser::ParseConstructorClosurization(Function* constructor,
ASSERT(!type.IsMalformedOrMalbounded());
if (!type.IsInstantiated()) {
Error& error = Error::Handle(Z);
- type ^= type.InstantiateFrom(*type_arguments, &error, NULL, Heap::kOld);
+ type ^= type.InstantiateFrom(*type_arguments,
+ &error,
+ NULL, // instantiation_trail
+ NULL, // bound_trail
+ Heap::kOld);
ASSERT(error.IsNull());
}
*type_arguments = type.arguments();
@@ -13385,7 +13389,8 @@ AstNode* Parser::ParseNewOperator(Token::Kind op_kind) {
redirect_type ^= redirect_type.InstantiateFrom(
type_arguments,
&error,
- NULL, // trail
+ NULL, // instantiation_trail
+ NULL, // bound_trail
Heap::kOld);
if (!error.IsNull()) {
redirect_type = ClassFinalizer::NewFinalizedMalformedType(
@@ -13425,7 +13430,7 @@ AstNode* Parser::ParseNewOperator(Token::Kind op_kind) {
return ThrowTypeError(redirect_type.token_pos(), redirect_type);
}
if (I->flags().type_checks() &&
- !redirect_type.IsSubtypeOf(type, NULL, Heap::kOld)) {
+ !redirect_type.IsSubtypeOf(type, NULL, NULL, Heap::kOld)) {
// Additional type checking of the result is necessary.
type_bound = type.raw();
}
« no previous file with comments | « runtime/vm/object.cc ('k') | tests/language/regress_25568_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698