Skip to content

Commit 8ef89b4

Browse files
creliercommit-bot@chromium.org
authored andcommitted
Revert "[VM/nnbd] Fix canonicalization of type 'Never' (fixes #40249)."
This reverts commit dfce72b. Reason for revert: This was not the correct fix Original change's description: > [VM/nnbd] Fix canonicalization of type 'Never' (fixes #40249). > > Change-Id: Ib3dc4fc6d31aeadb331fda017fc8b4f1a8ae8221 > Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/134382 > Reviewed-by: Alexander Markov <[email protected]> > Commit-Queue: Régis Crelier <[email protected]> [email protected],[email protected],[email protected] # Not skipping CQ checks because original CL landed > 1 day ago. Change-Id: I3b2fd4b4fcf829d3d94aa347c0b8660c5cdf82ce Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/134881 Reviewed-by: Régis Crelier <[email protected]> Commit-Queue: Régis Crelier <[email protected]>
1 parent 35cd618 commit 8ef89b4

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

runtime/vm/object.cc

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1041,13 +1041,7 @@ void Object::Init(Isolate* isolate) {
10411041
void_type_->SetCanonical();
10421042

10431043
cls = never_class_;
1044-
*never_type_ =
1045-
Type::New(cls, Object::null_type_arguments(), TokenPosition::kNoSource,
1046-
Dart::non_nullable_flag() ? Nullability::kNonNullable
1047-
: Nullability::kLegacy);
1048-
never_type_->SetIsFinalized();
1049-
never_type_->ComputeHash();
1050-
never_type_->SetCanonical();
1044+
*never_type_ = Type::NewNonParameterizedType(cls);
10511045

10521046
// Since TypeArguments objects are passed as function arguments, make them
10531047
// behave as Dart instances, although they are just VM objects.

0 commit comments

Comments
 (0)