Version 3.3.0-171.0.dev

Merge 1016d2f into dev
dart-lang · Nov 28, 2023 · 85b30ba · 85b30ba
2 parents b58735e + 1016d2f
commit 85b30ba
Show file tree

Hide file tree

Showing 15 changed files with 209 additions and 217 deletions.
diff --git a/pkg/_js_interop_checks/lib/src/transformations/static_interop_class_eraser.dart b/pkg/_js_interop_checks/lib/src/transformations/static_interop_class_eraser.dart
@@ -9,7 +9,6 @@ import 'package:kernel/ast.dart';
 import 'package:kernel/clone.dart';
 import 'package:kernel/core_types.dart';
 import 'package:kernel/kernel.dart';
-import 'package:kernel/reference_from_index.dart';
 import 'package:kernel/src/constant_replacer.dart';
 import 'package:kernel/src/replacement_visitor.dart';
 
@@ -141,7 +140,6 @@ class StaticInteropClassEraser extends Transformer {
   late final _StaticInteropConstantReplacer _constantReplacer;
   late final _TypeSubstitutor _typeSubstitutor;
   Component? currentComponent;
-  ReferenceFromIndex? referenceFromIndex;
   // Custom erasure function for `@staticInterop` types. This is useful for when
   // they should be erased to another type besides `JavaScriptObject`, like in
   // dart2wasm.
@@ -159,7 +157,7 @@ class StaticInteropClassEraser extends Transformer {
     '_wasm',
   };
 
-  StaticInteropClassEraser(CoreTypes coreTypes, this.referenceFromIndex,
+  StaticInteropClassEraser(CoreTypes coreTypes,
       {InterfaceType Function(InterfaceType staticInteropType)?
           eraseStaticInteropType,
       Set<String> additionalCoreLibraries = const {}}) {
@@ -195,12 +193,7 @@ class StaticInteropClassEraser extends Transformer {
       Name name = Name(stubName);
       var staticMethod = Procedure(
           name, ProcedureKind.Method, FunctionNode(null),
-          isStatic: true,
-          fileUri: factoryTarget.fileUri,
-          reference: referenceFromIndex
-              ?.lookupLibrary(factoryClass.enclosingLibrary)
-              ?.lookupIndexedClass(factoryClass.name)
-              ?.lookupGetterReference(name))
+          isStatic: true, fileUri: factoryTarget.fileUri)
         ..fileOffset = factoryTarget.fileOffset;
       factoryClass.addProcedure(staticMethod);
       // Clone function node after processing the stub in case of mutually

diff --git a/pkg/analysis_server/test/integration/analysis/get_reachable_sources_test.dart b/pkg/analysis_server/test/integration/analysis/get_reachable_sources_test.dart
@@ -34,7 +34,7 @@ class Bar {
     await analysisFinished;
 
     var result =
-        // ignore: deprecated_member_use_from_same_package
+        // ignore: deprecated_member_use
         await sendAnalysisGetReachableSources(pathname);
     var sources = result.sources;
     var keys = sources.keys.toList();

diff --git a/pkg/analysis_server/test/integration/analysis/update_options_test.dart b/pkg/analysis_server/test/integration/analysis/update_options_test.dart
@@ -30,13 +30,13 @@ class Foo {
 ''');
     await standardAnalysisSetup();
 
-    // ignore: deprecated_member_use_from_same_package
+    // ignore: deprecated_member_use
     await sendAnalysisUpdateOptions(AnalysisOptions()..generateHints = false);
     await sendAnalysisReanalyze();
     await analysisFinished;
     expect(getErrors(pathname), isEmpty);
 
-    // ignore: deprecated_member_use_from_same_package
+    // ignore: deprecated_member_use
     await sendAnalysisUpdateOptions(AnalysisOptions()..generateHints = true);
     await sendAnalysisReanalyze();
     await analysisFinished;

diff --git a/pkg/analysis_server/test/integration/execution/set_subscriptions_test.dart b/pkg/analysis_server/test/integration/execution/set_subscriptions_test.dart
@@ -17,7 +17,7 @@ void main() {
 class SetSubscriptionsTest extends AbstractAnalysisServerIntegrationTest {
   Future<void> test_subscribe() async {
     await standardAnalysisSetup();
-    // ignore: deprecated_member_use_from_same_package
+    // ignore: deprecated_member_use
     await sendExecutionSetSubscriptions([ExecutionService.LAUNCH_DATA]);
   }
 }