[CFE] Fix crash on extension type with duplicate name (2)

Change-Id: Id0464bbabbcbc535761acd5b2cc0082ffb8ad6b0 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/397800 Commit-Queue: Jens Johansen <[email protected]> Reviewed-by: Johnni Winther <[email protected]>
dart-lang · Nov 27, 2024 · 4ce2720 · 4ce2720
1 parent e88020b
commit 4ce2720
Show file tree

Hide file tree

Showing 15 changed files with 194 additions and 21 deletions.
diff --git a/pkg/front_end/lib/src/source/source_builder_mixins.dart b/pkg/front_end/lib/src/source/source_builder_mixins.dart
@@ -231,6 +231,9 @@ mixin SourceDeclarationBuilderMixin
           }
           addMemberDescriptorInternal(
               memberBuilder, memberKind, memberReference, tearOffReference);
+        } else {
+          // Still set parent to avoid crashes.
+          member.parent = libraryBuilder.library;
         }
       }
     }

diff --git a/...egress/extension_type_duplicate_name.dart → ...ess/extension_type_duplicate_name_01.dart b/...egress/extension_type_duplicate_name.dart → ...ess/extension_type_duplicate_name_01.dart
@@ -4,7 +4,7 @@
 
 int DuplicateName = 42;
 
-extension type DuplicateName._(int _x){
+extension type DuplicateName._(int _x) {
   DuplicateName(this._x) {
     bar;
   }

diff --git a/...icate_name.dart.strong.transformed.expect → ...type_duplicate_name_01.dart.strong.expect b/...icate_name.dart.strong.transformed.expect → ...type_duplicate_name_01.dart.strong.expect
@@ -2,17 +2,17 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/regress/extension_type_duplicate_name.dart:7:16: Error: 'DuplicateName' is already declared in this scope.
-// extension type DuplicateName._(int _x){
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_01.dart:7:16: Error: 'DuplicateName' is already declared in this scope.
+// extension type DuplicateName._(int _x) {
 //                ^^^^^^^^^^^^^
-// pkg/front_end/testcases/regress/extension_type_duplicate_name.dart:5:5: Context: Previous declaration of 'DuplicateName'.
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_01.dart:5:5: Context: Previous declaration of 'DuplicateName'.
 // int DuplicateName = 42;
 //     ^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/regress/extension_type_duplicate_name.dart:11:11: Error: 'DuplicateName' isn't a type.
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_01.dart:11:11: Error: 'DuplicateName' isn't a type.
 //   int get bar => 42;
 //           ^
-// pkg/front_end/testcases/regress/extension_type_duplicate_name.dart:11:11: Context: This isn't a type.
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_01.dart:11:11: Context: This isn't a type.
 //   int get bar => 42;
 //           ^
 //

diff --git a/...on_type_duplicate_name.dart.strong.expect → ...licate_name_01.dart.strong.modular.expect b/...on_type_duplicate_name.dart.strong.expect → ...licate_name_01.dart.strong.modular.expect
@@ -2,17 +2,17 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/regress/extension_type_duplicate_name.dart:7:16: Error: 'DuplicateName' is already declared in this scope.
-// extension type DuplicateName._(int _x){
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_01.dart:7:16: Error: 'DuplicateName' is already declared in this scope.
+// extension type DuplicateName._(int _x) {
 //                ^^^^^^^^^^^^^
-// pkg/front_end/testcases/regress/extension_type_duplicate_name.dart:5:5: Context: Previous declaration of 'DuplicateName'.
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_01.dart:5:5: Context: Previous declaration of 'DuplicateName'.
 // int DuplicateName = 42;
 //     ^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/regress/extension_type_duplicate_name.dart:11:11: Error: 'DuplicateName' isn't a type.
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_01.dart:11:11: Error: 'DuplicateName' isn't a type.
 //   int get bar => 42;
 //           ^
-// pkg/front_end/testcases/regress/extension_type_duplicate_name.dart:11:11: Context: This isn't a type.
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_01.dart:11:11: Context: This isn't a type.
 //   int get bar => 42;
 //           ^
 //

diff --git a/...duplicate_name.dart.strong.outline.expect → ...licate_name_01.dart.strong.outline.expect b/...duplicate_name.dart.strong.outline.expect → ...licate_name_01.dart.strong.outline.expect
@@ -2,17 +2,17 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/regress/extension_type_duplicate_name.dart:7:16: Error: 'DuplicateName' is already declared in this scope.
-// extension type DuplicateName._(int _x){
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_01.dart:7:16: Error: 'DuplicateName' is already declared in this scope.
+// extension type DuplicateName._(int _x) {
 //                ^^^^^^^^^^^^^
-// pkg/front_end/testcases/regress/extension_type_duplicate_name.dart:5:5: Context: Previous declaration of 'DuplicateName'.
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_01.dart:5:5: Context: Previous declaration of 'DuplicateName'.
 // int DuplicateName = 42;
 //     ^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/regress/extension_type_duplicate_name.dart:11:11: Error: 'DuplicateName' isn't a type.
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_01.dart:11:11: Error: 'DuplicateName' isn't a type.
 //   int get bar => 42;
 //           ^
-// pkg/front_end/testcases/regress/extension_type_duplicate_name.dart:11:11: Context: This isn't a type.
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_01.dart:11:11: Context: This isn't a type.
 //   int get bar => 42;
 //           ^
 //

diff --git a/...duplicate_name.dart.strong.modular.expect → ...te_name_01.dart.strong.transformed.expect b/...duplicate_name.dart.strong.modular.expect → ...te_name_01.dart.strong.transformed.expect
@@ -2,17 +2,17 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/regress/extension_type_duplicate_name.dart:7:16: Error: 'DuplicateName' is already declared in this scope.
-// extension type DuplicateName._(int _x){
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_01.dart:7:16: Error: 'DuplicateName' is already declared in this scope.
+// extension type DuplicateName._(int _x) {
 //                ^^^^^^^^^^^^^
-// pkg/front_end/testcases/regress/extension_type_duplicate_name.dart:5:5: Context: Previous declaration of 'DuplicateName'.
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_01.dart:5:5: Context: Previous declaration of 'DuplicateName'.
 // int DuplicateName = 42;
 //     ^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/regress/extension_type_duplicate_name.dart:11:11: Error: 'DuplicateName' isn't a type.
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_01.dart:11:11: Error: 'DuplicateName' isn't a type.
 //   int get bar => 42;
 //           ^
-// pkg/front_end/testcases/regress/extension_type_duplicate_name.dart:11:11: Context: This isn't a type.
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_01.dart:11:11: Context: This isn't a type.
 //   int get bar => 42;
 //           ^
 //

diff --git a/...uplicate_name.dart.textual_outline.expect → ...icate_name_01.dart.textual_outline.expect b/...uplicate_name.dart.textual_outline.expect → ...icate_name_01.dart.textual_outline.expect
diff --git a/...name.dart.textual_outline_modelled.expect → ...e_01.dart.textual_outline_modelled.expect b/...name.dart.textual_outline_modelled.expect → ...e_01.dart.textual_outline_modelled.expect
diff --git a/pkg/front_end/testcases/regress/extension_type_duplicate_name_02.dart b/pkg/front_end/testcases/regress/extension_type_duplicate_name_02.dart
@@ -0,0 +1,10 @@
+// Copyright (c) 2024, the Dart project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+int DuplicateName = 42;
+
+extension type DuplicateName._(int _x) {
+  static set bar(int newBar) {}
+  int get bar => 42;
+}
diff --git a/pkg/front_end/testcases/regress/extension_type_duplicate_name_02.dart.strong.expect b/pkg/front_end/testcases/regress/extension_type_duplicate_name_02.dart.strong.expect
@@ -0,0 +1,37 @@
+library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_02.dart:7:16: Error: 'DuplicateName' is already declared in this scope.
+// extension type DuplicateName._(int _x) {
+//                ^^^^^^^^^^^^^
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_02.dart:5:5: Context: Previous declaration of 'DuplicateName'.
+// int DuplicateName = 42;
+//     ^^^^^^^^^^^^^
+//
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_02.dart:9:11: Error: 'DuplicateName' isn't a type.
+//   int get bar => 42;
+//           ^
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_02.dart:9:11: Context: This isn't a type.
+//   int get bar => 42;
+//           ^
+//
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_02.dart:8:14: Error: Conflicts with member 'bar'.
+//   static set bar(int newBar) {}
+//              ^
+//
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_02.dart:9:11: Error: Conflicts with setter 'bar'.
+//   int get bar => 42;
+//           ^
+//
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_02.dart:8:14: Error: This static member conflicts with an instance member.
+//   static set bar(int newBar) {}
+//              ^^^
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_02.dart:9:11: Context: This is the instance member.
+//   int get bar => 42;
+//           ^^^
+//
+import self as self;
+import "dart:core" as core;
+
+static field core::int DuplicateName = 42;
diff --git a/pkg/front_end/testcases/regress/extension_type_duplicate_name_02.dart.strong.modular.expect b/pkg/front_end/testcases/regress/extension_type_duplicate_name_02.dart.strong.modular.expect
@@ -0,0 +1,37 @@
+library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_02.dart:7:16: Error: 'DuplicateName' is already declared in this scope.
+// extension type DuplicateName._(int _x) {
+//                ^^^^^^^^^^^^^
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_02.dart:5:5: Context: Previous declaration of 'DuplicateName'.
+// int DuplicateName = 42;
+//     ^^^^^^^^^^^^^
+//
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_02.dart:9:11: Error: 'DuplicateName' isn't a type.
+//   int get bar => 42;
+//           ^
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_02.dart:9:11: Context: This isn't a type.
+//   int get bar => 42;
+//           ^
+//
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_02.dart:8:14: Error: Conflicts with member 'bar'.
+//   static set bar(int newBar) {}
+//              ^
+//
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_02.dart:9:11: Error: Conflicts with setter 'bar'.
+//   int get bar => 42;
+//           ^
+//
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_02.dart:8:14: Error: This static member conflicts with an instance member.
+//   static set bar(int newBar) {}
+//              ^^^
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_02.dart:9:11: Context: This is the instance member.
+//   int get bar => 42;
+//           ^^^
+//
+import self as self;
+import "dart:core" as core;
+
+static field core::int DuplicateName = 42;
diff --git a/pkg/front_end/testcases/regress/extension_type_duplicate_name_02.dart.strong.outline.expect b/pkg/front_end/testcases/regress/extension_type_duplicate_name_02.dart.strong.outline.expect
@@ -0,0 +1,37 @@
+library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_02.dart:7:16: Error: 'DuplicateName' is already declared in this scope.
+// extension type DuplicateName._(int _x) {
+//                ^^^^^^^^^^^^^
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_02.dart:5:5: Context: Previous declaration of 'DuplicateName'.
+// int DuplicateName = 42;
+//     ^^^^^^^^^^^^^
+//
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_02.dart:9:11: Error: 'DuplicateName' isn't a type.
+//   int get bar => 42;
+//           ^
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_02.dart:9:11: Context: This isn't a type.
+//   int get bar => 42;
+//           ^
+//
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_02.dart:8:14: Error: Conflicts with member 'bar'.
+//   static set bar(int newBar) {}
+//              ^
+//
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_02.dart:9:11: Error: Conflicts with setter 'bar'.
+//   int get bar => 42;
+//           ^
+//
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_02.dart:8:14: Error: This static member conflicts with an instance member.
+//   static set bar(int newBar) {}
+//              ^^^
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_02.dart:9:11: Context: This is the instance member.
+//   int get bar => 42;
+//           ^^^
+//
+import self as self;
+import "dart:core" as core;
+
+static field core::int DuplicateName;
diff --git a/...ont_end/testcases/regress/extension_type_duplicate_name_02.dart.strong.transformed.expect b/...ont_end/testcases/regress/extension_type_duplicate_name_02.dart.strong.transformed.expect
@@ -0,0 +1,37 @@
+library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_02.dart:7:16: Error: 'DuplicateName' is already declared in this scope.
+// extension type DuplicateName._(int _x) {
+//                ^^^^^^^^^^^^^
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_02.dart:5:5: Context: Previous declaration of 'DuplicateName'.
+// int DuplicateName = 42;
+//     ^^^^^^^^^^^^^
+//
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_02.dart:9:11: Error: 'DuplicateName' isn't a type.
+//   int get bar => 42;
+//           ^
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_02.dart:9:11: Context: This isn't a type.
+//   int get bar => 42;
+//           ^
+//
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_02.dart:8:14: Error: Conflicts with member 'bar'.
+//   static set bar(int newBar) {}
+//              ^
+//
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_02.dart:9:11: Error: Conflicts with setter 'bar'.
+//   int get bar => 42;
+//           ^
+//
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_02.dart:8:14: Error: This static member conflicts with an instance member.
+//   static set bar(int newBar) {}
+//              ^^^
+// pkg/front_end/testcases/regress/extension_type_duplicate_name_02.dart:9:11: Context: This is the instance member.
+//   int get bar => 42;
+//           ^^^
+//
+import self as self;
+import "dart:core" as core;
+
+static field core::int DuplicateName = 42;
diff --git a/pkg/front_end/testcases/regress/extension_type_duplicate_name_02.dart.textual_outline.expect b/pkg/front_end/testcases/regress/extension_type_duplicate_name_02.dart.textual_outline.expect
@@ -0,0 +1,6 @@
+int DuplicateName = 42;
+
+extension type DuplicateName._(int _x) {
+  static set bar(int newBar) {}
+  int get bar => 42;
+}
diff --git a/...d/testcases/regress/extension_type_duplicate_name_02.dart.textual_outline_modelled.expect b/...d/testcases/regress/extension_type_duplicate_name_02.dart.textual_outline_modelled.expect
@@ -0,0 +1,6 @@
+extension type DuplicateName._(int _x) {
+  int get bar => 42;
+  static set bar(int newBar) {}
+}
+
+int DuplicateName = 42;