diff --git a/pkg/vm/lib/transformations/type_flow/analysis.dart b/pkg/vm/lib/transformations/type_flow/analysis.dart index c4b0cafbf9b..bcfcae8f8b5 100644 --- a/pkg/vm/lib/transformations/type_flow/analysis.dart +++ b/pkg/vm/lib/transformations/type_flow/analysis.dart @@ -79,7 +79,7 @@ class _DependencyTracker { /// This is the basic unit of processing in type flow analysis. /// Call sites calling the same method with the same argument types /// may reuse results of the analysis through the same _Invocation instance. -abstract class _Invocation extends _DependencyTracker +abstract base class _Invocation extends _DependencyTracker with LinkedListEntry<_Invocation> { final Selector selector; final Args args; @@ -187,7 +187,7 @@ abstract class _Invocation extends _DependencyTracker } } -class _DirectInvocation extends _Invocation { +final class _DirectInvocation extends _Invocation { _DirectInvocation(DirectSelector selector, Args args) : super(selector, args); @@ -367,7 +367,7 @@ class _DirectInvocation extends _Invocation { } } -class _DispatchableInvocation extends _Invocation { +final class _DispatchableInvocation extends _Invocation { bool _isPolymorphic = false; Set? _callSites; // Populated only if not polymorphic. Member? _monomorphicTarget; diff --git a/pkg/vm/pubspec.yaml b/pkg/vm/pubspec.yaml index b2d12ec322d..0a867e3f709 100644 --- a/pkg/vm/pubspec.yaml +++ b/pkg/vm/pubspec.yaml @@ -4,7 +4,7 @@ description: VM specific Dart code and helper scripts publish_to: none environment: - sdk: '>=2.17.0 <4.0.0' + sdk: '>=3.0.0 <4.0.0' # Use 'any' constraints here; we get our versions from the DEPS file. dependencies: diff --git a/pkg/vm/testcases/transformations/type_flow/summary_collector/records.dart.options b/pkg/vm/testcases/transformations/type_flow/summary_collector/records.dart.options deleted file mode 100644 index 8bf50f313c3..00000000000 --- a/pkg/vm/testcases/transformations/type_flow/summary_collector/records.dart.options +++ /dev/null @@ -1 +0,0 @@ ---enable-experiment=records \ No newline at end of file diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/records.dart.options b/pkg/vm/testcases/transformations/type_flow/transformer/records.dart.options deleted file mode 100644 index 8bf50f313c3..00000000000 --- a/pkg/vm/testcases/transformations/type_flow/transformer/records.dart.options +++ /dev/null @@ -1 +0,0 @@ ---enable-experiment=records \ No newline at end of file diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/records_dart2wasm.dart.options b/pkg/vm/testcases/transformations/type_flow/transformer/records_dart2wasm.dart.options index 8d074c1eed7..024b6c72cbc 100644 --- a/pkg/vm/testcases/transformations/type_flow/transformer/records_dart2wasm.dart.options +++ b/pkg/vm/testcases/transformations/type_flow/transformer/records_dart2wasm.dart.options @@ -1,2 +1 @@ ---enable-experiment=records --target=dart2wasm diff --git a/pkg/vm/testcases/transformations/unreachable_code_elimination/uce_testcases.dart.expect b/pkg/vm/testcases/transformations/unreachable_code_elimination/uce_testcases.dart.expect index a02a2757f86..b09c0e218a4 100644 --- a/pkg/vm/testcases/transformations/unreachable_code_elimination/uce_testcases.dart.expect +++ b/pkg/vm/testcases/transformations/unreachable_code_elimination/uce_testcases.dart.expect @@ -68,13 +68,15 @@ static method testRemovalOfStatementBodies() → dynamic { on core::Object catch(final core::Object e) { } {} + #L1: switch(42) /* core::int */ { - #L1: + #L2: case #C3: {} } + #L3: switch(42) /* core::int */ { - #L2: + #L4: default: {} } diff --git a/pkg/vm/tool/compare_il b/pkg/vm/tool/compare_il index 5db629b9052..4973042b005 100755 --- a/pkg/vm/tool/compare_il +++ b/pkg/vm/tool/compare_il @@ -28,4 +28,4 @@ SDK_DIR="$CUR_DIR/../../.." # checked-in dart binaries must be adjusted. DART="$SDK_DIR/tools/sdks/dart-sdk/bin/dart" -exec "$DART" $DART_VM_FLAGS --enable-experiment=records,patterns "${SDK_DIR}/pkg/vm/bin/compare_il.dart" $@ +exec "$DART" $DART_VM_FLAGS "${SDK_DIR}/pkg/vm/bin/compare_il.dart" $@ diff --git a/pkg/vm/tool/compare_il.bat b/pkg/vm/tool/compare_il.bat index bd7ac7489f0..009aca70467 100644 --- a/pkg/vm/tool/compare_il.bat +++ b/pkg/vm/tool/compare_il.bat @@ -14,4 +14,4 @@ set SDK_DIR=%SCRIPTPATH%/../../../ set DART=%SDK_DIR%/tools/sdks/dart-sdk/bin/dart.exe -"%DART%" %DART_VM_OPTIONS% --enable-experiment=records,patterns "%SDK_DIR%/pkg/vm/bin/compare_il.dart" %* +"%DART%" %DART_VM_OPTIONS% "%SDK_DIR%/pkg/vm/bin/compare_il.dart" %*