From 85fd1b8f435cacbf5b082cc3b8a1eb0acd78da06 Mon Sep 17 00:00:00 2001 From: Ilya Yanok Date: Fri, 6 Oct 2023 13:34:56 +0000 Subject: [PATCH] Revert "Bump version to 3.3." This reverts commit 81aaf6c6c400c1f2f6c2dc36e0fc0a1776692135. Reason for revert: regression in G3: b/303734572 Original change's description: > Bump version to 3.3. > > Remove needless version number comment from experimental_features to > remove duplicated information and simplify version updates. > > Tested: CQ > Change-Id: I864bfc44070136406e95fdaf4d83f491b2c95943 > Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/329460 > Reviewed-by: Alexander Thomas Change-Id: Ie7dca3106345ee7949ccd13ab4765998926c0abc No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/329603 Commit-Queue: Ilya Yanok Bot-Commit: Rubber Stamper Reviewed-by: Alexander Thomas --- pkg/_fe_analyzer_shared/lib/src/experiments/flags.dart | 2 +- pkg/analyzer/lib/src/dart/analysis/experiments.g.dart | 2 +- .../expression_compiler/expression_compiler_e2e_shared.dart | 2 +- .../extension_type_declaration_disabled.dart.strong.expect | 4 ++-- ...n_type_declaration_disabled.dart.strong.transformed.expect | 4 ++-- .../extension_type_declaration_disabled.dart.weak.expect | 4 ++-- ...tension_type_declaration_disabled.dart.weak.modular.expect | 4 ++-- ...tension_type_declaration_disabled.dart.weak.outline.expect | 4 ++-- ...ion_type_declaration_disabled.dart.weak.transformed.expect | 4 ++-- pkg/kernel/lib/default_language_version.dart | 2 +- .../test/step_through_extension_type_method_call_test.dart | 2 +- runtime/vm/experimental_features.cc | 2 ++ runtime/vm/experimental_features.h | 2 ++ tools/VERSION | 2 +- tools/experimental_features.yaml | 2 +- tools/generate_experimental_flags.dart | 4 ++++ 16 files changed, 27 insertions(+), 19 deletions(-) diff --git a/pkg/_fe_analyzer_shared/lib/src/experiments/flags.dart b/pkg/_fe_analyzer_shared/lib/src/experiments/flags.dart index d3f97b8e77d..fbbb3b2f8fd 100644 --- a/pkg/_fe_analyzer_shared/lib/src/experiments/flags.dart +++ b/pkg/_fe_analyzer_shared/lib/src/experiments/flags.dart @@ -6,7 +6,7 @@ // // Instead modify 'tools/experimental_features.yaml' and run // 'dart pkg/front_end/tool/fasta.dart generate-experimental-flags' to update. -const Version defaultLanguageVersion = const Version(3, 3); +const Version defaultLanguageVersion = const Version(3, 2); /// Enum for experimental flags shared between the CFE and the analyzer. enum ExperimentalFlag { diff --git a/pkg/analyzer/lib/src/dart/analysis/experiments.g.dart b/pkg/analyzer/lib/src/dart/analysis/experiments.g.dart index b8297a226c8..74a031b99dc 100644 --- a/pkg/analyzer/lib/src/dart/analysis/experiments.g.dart +++ b/pkg/analyzer/lib/src/dart/analysis/experiments.g.dart @@ -12,7 +12,7 @@ part of 'experiments.dart'; /// The current version of the Dart language (or, for non-stable releases, the /// version of the language currently in the process of being developed). -const _currentVersion = '3.3.0'; +const _currentVersion = '3.2.0'; /// A map containing information about all known experimental flags. final _knownFeatures = { diff --git a/pkg/dev_compiler/test/expression_compiler/expression_compiler_e2e_shared.dart b/pkg/dev_compiler/test/expression_compiler/expression_compiler_e2e_shared.dart index 291ee3bfe2a..4523057b23d 100644 --- a/pkg/dev_compiler/test/expression_compiler/expression_compiler_e2e_shared.dart +++ b/pkg/dev_compiler/test/expression_compiler/expression_compiler_e2e_shared.dart @@ -148,7 +148,7 @@ void runNullSafeSharedTests( group('JS interop with extension types', () { const interopSource = r''' - // @dart=3.3 + // @dart=3.2 @JS() library debug_static_interop; diff --git a/pkg/front_end/testcases/general/extension_type_declaration_disabled.dart.strong.expect b/pkg/front_end/testcases/general/extension_type_declaration_disabled.dart.strong.expect index 36a66ff441b..a5b70ee28c2 100644 --- a/pkg/front_end/testcases/general/extension_type_declaration_disabled.dart.strong.expect +++ b/pkg/front_end/testcases/general/extension_type_declaration_disabled.dart.strong.expect @@ -3,7 +3,7 @@ library; // Problems in library: // // pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:7:11: Error: The 'inline-class' language feature is disabled for this library. -// Try removing the `@dart=` annotation or setting the language version to 3.3 or higher. +// Try removing the `@dart=` annotation or setting the language version to 3.2 or higher. // extension type ExtensionType1(int it) {} // ^^^^ // pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:5:1: Context: This is the annotation that opts out this library from the 'inline-class' language feature. @@ -11,7 +11,7 @@ library; // ^^^^^^^^^^^^^ // // pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:8:11: Error: The 'inline-class' language feature is disabled for this library. -// Try removing the `@dart=` annotation or setting the language version to 3.3 or higher. +// Try removing the `@dart=` annotation or setting the language version to 3.2 or higher. // extension type ExtensionType2._(int it) implements int, ExtensionType1 {} // ^^^^ // pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:5:1: Context: This is the annotation that opts out this library from the 'inline-class' language feature. diff --git a/pkg/front_end/testcases/general/extension_type_declaration_disabled.dart.strong.transformed.expect b/pkg/front_end/testcases/general/extension_type_declaration_disabled.dart.strong.transformed.expect index 36a66ff441b..a5b70ee28c2 100644 --- a/pkg/front_end/testcases/general/extension_type_declaration_disabled.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/general/extension_type_declaration_disabled.dart.strong.transformed.expect @@ -3,7 +3,7 @@ library; // Problems in library: // // pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:7:11: Error: The 'inline-class' language feature is disabled for this library. -// Try removing the `@dart=` annotation or setting the language version to 3.3 or higher. +// Try removing the `@dart=` annotation or setting the language version to 3.2 or higher. // extension type ExtensionType1(int it) {} // ^^^^ // pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:5:1: Context: This is the annotation that opts out this library from the 'inline-class' language feature. @@ -11,7 +11,7 @@ library; // ^^^^^^^^^^^^^ // // pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:8:11: Error: The 'inline-class' language feature is disabled for this library. -// Try removing the `@dart=` annotation or setting the language version to 3.3 or higher. +// Try removing the `@dart=` annotation or setting the language version to 3.2 or higher. // extension type ExtensionType2._(int it) implements int, ExtensionType1 {} // ^^^^ // pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:5:1: Context: This is the annotation that opts out this library from the 'inline-class' language feature. diff --git a/pkg/front_end/testcases/general/extension_type_declaration_disabled.dart.weak.expect b/pkg/front_end/testcases/general/extension_type_declaration_disabled.dart.weak.expect index 36a66ff441b..a5b70ee28c2 100644 --- a/pkg/front_end/testcases/general/extension_type_declaration_disabled.dart.weak.expect +++ b/pkg/front_end/testcases/general/extension_type_declaration_disabled.dart.weak.expect @@ -3,7 +3,7 @@ library; // Problems in library: // // pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:7:11: Error: The 'inline-class' language feature is disabled for this library. -// Try removing the `@dart=` annotation or setting the language version to 3.3 or higher. +// Try removing the `@dart=` annotation or setting the language version to 3.2 or higher. // extension type ExtensionType1(int it) {} // ^^^^ // pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:5:1: Context: This is the annotation that opts out this library from the 'inline-class' language feature. @@ -11,7 +11,7 @@ library; // ^^^^^^^^^^^^^ // // pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:8:11: Error: The 'inline-class' language feature is disabled for this library. -// Try removing the `@dart=` annotation or setting the language version to 3.3 or higher. +// Try removing the `@dart=` annotation or setting the language version to 3.2 or higher. // extension type ExtensionType2._(int it) implements int, ExtensionType1 {} // ^^^^ // pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:5:1: Context: This is the annotation that opts out this library from the 'inline-class' language feature. diff --git a/pkg/front_end/testcases/general/extension_type_declaration_disabled.dart.weak.modular.expect b/pkg/front_end/testcases/general/extension_type_declaration_disabled.dart.weak.modular.expect index 36a66ff441b..a5b70ee28c2 100644 --- a/pkg/front_end/testcases/general/extension_type_declaration_disabled.dart.weak.modular.expect +++ b/pkg/front_end/testcases/general/extension_type_declaration_disabled.dart.weak.modular.expect @@ -3,7 +3,7 @@ library; // Problems in library: // // pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:7:11: Error: The 'inline-class' language feature is disabled for this library. -// Try removing the `@dart=` annotation or setting the language version to 3.3 or higher. +// Try removing the `@dart=` annotation or setting the language version to 3.2 or higher. // extension type ExtensionType1(int it) {} // ^^^^ // pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:5:1: Context: This is the annotation that opts out this library from the 'inline-class' language feature. @@ -11,7 +11,7 @@ library; // ^^^^^^^^^^^^^ // // pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:8:11: Error: The 'inline-class' language feature is disabled for this library. -// Try removing the `@dart=` annotation or setting the language version to 3.3 or higher. +// Try removing the `@dart=` annotation or setting the language version to 3.2 or higher. // extension type ExtensionType2._(int it) implements int, ExtensionType1 {} // ^^^^ // pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:5:1: Context: This is the annotation that opts out this library from the 'inline-class' language feature. diff --git a/pkg/front_end/testcases/general/extension_type_declaration_disabled.dart.weak.outline.expect b/pkg/front_end/testcases/general/extension_type_declaration_disabled.dart.weak.outline.expect index 31fe161c99f..f9803032d35 100644 --- a/pkg/front_end/testcases/general/extension_type_declaration_disabled.dart.weak.outline.expect +++ b/pkg/front_end/testcases/general/extension_type_declaration_disabled.dart.weak.outline.expect @@ -3,7 +3,7 @@ library; // Problems in library: // // pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:7:11: Error: The 'inline-class' language feature is disabled for this library. -// Try removing the `@dart=` annotation or setting the language version to 3.3 or higher. +// Try removing the `@dart=` annotation or setting the language version to 3.2 or higher. // extension type ExtensionType1(int it) {} // ^^^^ // pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:5:1: Context: This is the annotation that opts out this library from the 'inline-class' language feature. @@ -11,7 +11,7 @@ library; // ^^^^^^^^^^^^^ // // pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:8:11: Error: The 'inline-class' language feature is disabled for this library. -// Try removing the `@dart=` annotation or setting the language version to 3.3 or higher. +// Try removing the `@dart=` annotation or setting the language version to 3.2 or higher. // extension type ExtensionType2._(int it) implements int, ExtensionType1 {} // ^^^^ // pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:5:1: Context: This is the annotation that opts out this library from the 'inline-class' language feature. diff --git a/pkg/front_end/testcases/general/extension_type_declaration_disabled.dart.weak.transformed.expect b/pkg/front_end/testcases/general/extension_type_declaration_disabled.dart.weak.transformed.expect index 36a66ff441b..a5b70ee28c2 100644 --- a/pkg/front_end/testcases/general/extension_type_declaration_disabled.dart.weak.transformed.expect +++ b/pkg/front_end/testcases/general/extension_type_declaration_disabled.dart.weak.transformed.expect @@ -3,7 +3,7 @@ library; // Problems in library: // // pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:7:11: Error: The 'inline-class' language feature is disabled for this library. -// Try removing the `@dart=` annotation or setting the language version to 3.3 or higher. +// Try removing the `@dart=` annotation or setting the language version to 3.2 or higher. // extension type ExtensionType1(int it) {} // ^^^^ // pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:5:1: Context: This is the annotation that opts out this library from the 'inline-class' language feature. @@ -11,7 +11,7 @@ library; // ^^^^^^^^^^^^^ // // pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:8:11: Error: The 'inline-class' language feature is disabled for this library. -// Try removing the `@dart=` annotation or setting the language version to 3.3 or higher. +// Try removing the `@dart=` annotation or setting the language version to 3.2 or higher. // extension type ExtensionType2._(int it) implements int, ExtensionType1 {} // ^^^^ // pkg/front_end/testcases/general/extension_type_declaration_disabled.dart:5:1: Context: This is the annotation that opts out this library from the 'inline-class' language feature. diff --git a/pkg/kernel/lib/default_language_version.dart b/pkg/kernel/lib/default_language_version.dart index 93ff84c1b3e..20143f19866 100644 --- a/pkg/kernel/lib/default_language_version.dart +++ b/pkg/kernel/lib/default_language_version.dart @@ -9,4 +9,4 @@ import "ast.dart"; -const Version defaultLanguageVersion = const Version(3, 3); +const Version defaultLanguageVersion = const Version(3, 2); diff --git a/pkg/vm_service/test/step_through_extension_type_method_call_test.dart b/pkg/vm_service/test/step_through_extension_type_method_call_test.dart index 5abf43131a6..4cac4a661f4 100644 --- a/pkg/vm_service/test/step_through_extension_type_method_call_test.dart +++ b/pkg/vm_service/test/step_through_extension_type_method_call_test.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. // VMOptions=--enable-experiment=inline-class -// @dart=3.3 +// @dart=3.2 // ignore_for_file: experiment_not_enabled,undefined_class,undefined_function import 'package:test/test.dart'; diff --git a/runtime/vm/experimental_features.cc b/runtime/vm/experimental_features.cc index ba679c8789b..93dcb31adf5 100644 --- a/runtime/vm/experimental_features.cc +++ b/runtime/vm/experimental_features.cc @@ -5,6 +5,8 @@ // // Instead modify 'tools/experimental_features.yaml' and run // 'dart tools/generate_experimental_flags.dart' to update. +// +// Current version: 3.2.0 #include "vm/experimental_features.h" diff --git a/runtime/vm/experimental_features.h b/runtime/vm/experimental_features.h index ff5a37b4b38..4bf0ae3c204 100644 --- a/runtime/vm/experimental_features.h +++ b/runtime/vm/experimental_features.h @@ -5,6 +5,8 @@ // // Instead modify 'tools/experimental_features.yaml' and run // 'dart tools/generate_experimental_flags.dart' to update. +// +// Current version: 3.2.0 #ifndef RUNTIME_VM_EXPERIMENTAL_FEATURES_H_ #define RUNTIME_VM_EXPERIMENTAL_FEATURES_H_ diff --git a/tools/VERSION b/tools/VERSION index 0cf0f54b0d8..d231ac0f0b6 100644 --- a/tools/VERSION +++ b/tools/VERSION @@ -25,7 +25,7 @@ # CHANNEL be MAJOR 3 -MINOR 3 +MINOR 2 PATCH 0 PRERELEASE 0 PRERELEASE_PATCH 0 diff --git a/tools/experimental_features.yaml b/tools/experimental_features.yaml index 3d46206fd9e..f9cb06e9941 100644 --- a/tools/experimental_features.yaml +++ b/tools/experimental_features.yaml @@ -109,7 +109,7 @@ # default 'language' "category" with code generated for both CFE and Analyzer, # while other categories can be tailored more specifically. -current-version: '3.3.0' +current-version: '3.2.0' features: variance: diff --git a/tools/generate_experimental_flags.dart b/tools/generate_experimental_flags.dart index 9ac3c6408e1..f096ae9f152 100644 --- a/tools/generate_experimental_flags.dart +++ b/tools/generate_experimental_flags.dart @@ -36,6 +36,8 @@ void main() { // // Instead modify 'tools/experimental_features.yaml' and run // 'dart tools/generate_experimental_flags.dart' to update. +// +// Current version: ${currentVersion.join('.')} #ifndef RUNTIME_VM_EXPERIMENTAL_FEATURES_H_ #define RUNTIME_VM_EXPERIMENTAL_FEATURES_H_ @@ -61,6 +63,8 @@ const char* GetExperimentalFeatureName(ExperimentalFeature feature); // // Instead modify 'tools/experimental_features.yaml' and run // 'dart tools/generate_experimental_flags.dart' to update. +// +// Current version: ${currentVersion.join('.')} #include "vm/experimental_features.h"