[dart2js] Unland deferredSerialization flag
Change-Id: Id04cab15d8e81df9661390b1d4cc48d2767abded
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/251243
Commit-Queue: Nate Biggs <natebiggs@google.com>
Reviewed-by: Sigmund Cherem <sigmund@google.com>
diff --git a/pkg/compiler/lib/src/options.dart b/pkg/compiler/lib/src/options.dart
index f27676d..4eb1c89 100644
--- a/pkg/compiler/lib/src/options.dart
+++ b/pkg/compiler/lib/src/options.dart
@@ -103,12 +103,12 @@
/// [FeatureOption]s which default to enabled.
late final List<FeatureOption> shipping = [
- deferredSerialization,
useContentSecurityPolicy,
];
/// [FeatureOption]s which default to disabled.
late final List<FeatureOption> canary = [
+ deferredSerialization,
writeUtf8,
newDumpInfo,
simpleAsyncToFuture,
diff --git a/pkg/compiler/test/dump_info/data/deferred/main.dart b/pkg/compiler/test/dump_info/data/deferred/main.dart
index c4f9945..2ab399c 100644
--- a/pkg/compiler/test/dump_info/data/deferred/main.dart
+++ b/pkg/compiler/test/dump_info/data/deferred/main.dart
@@ -4,122 +4,7 @@
// @dart = 2.7
-/*spec.library:
- constant=[
- {
- "id": "constant/B.C_Deferred = A.lib__funky$closure();\n",
- "kind": "constant",
- "name": "",
- "size": 39,
- "outputUnit": "outputUnit/1",
- "code": "B.C_Deferred = A.lib__funky$closure();\n"
-},
- {
- "id": "constant/B.C_JS_CONST = function getTagFallback(o) {\n var s = Object.prototype.toString.call(o);\n return s.substring(8, s.length - 1);\n};\n",
- "kind": "constant",
- "name": "",
- "size": 131,
- "outputUnit": "outputUnit/main",
- "code": "B.C_JS_CONST = function getTagFallback(o) {\n var s = Object.prototype.toString.call(o);\n return s.substring(8, s.length - 1);\n};\n"
-},
- {
- "id": "constant/B.C__RootZone = new A._RootZone();\n",
- "kind": "constant",
- "name": "",
- "size": 35,
- "outputUnit": "outputUnit/main",
- "code": "B.C__RootZone = new A._RootZone();\n"
-},
- {
- "id": "constant/B.C__StringStackTrace = new A._StringStackTrace();\n",
- "kind": "constant",
- "name": "",
- "size": 51,
- "outputUnit": "outputUnit/main",
- "code": "B.C__StringStackTrace = new A._StringStackTrace();\n"
-},
- {
- "id": "constant/B.Interceptor_methods = J.Interceptor.prototype;\n",
- "kind": "constant",
- "name": "",
- "size": 49,
- "outputUnit": "outputUnit/main",
- "code": "B.Interceptor_methods = J.Interceptor.prototype;\n"
-},
- {
- "id": "constant/B.JSArray_methods = J.JSArray.prototype;\n",
- "kind": "constant",
- "name": "",
- "size": 41,
- "outputUnit": "outputUnit/main",
- "code": "B.JSArray_methods = J.JSArray.prototype;\n"
-},
- {
- "id": "constant/B.JSInt_methods = J.JSInt.prototype;\n",
- "kind": "constant",
- "name": "",
- "size": 37,
- "outputUnit": "outputUnit/main",
- "code": "B.JSInt_methods = J.JSInt.prototype;\n"
-},
- {
- "id": "constant/B.JSString_methods = J.JSString.prototype;\n",
- "kind": "constant",
- "name": "",
- "size": 43,
- "outputUnit": "outputUnit/main",
- "code": "B.JSString_methods = J.JSString.prototype;\n"
-},
- {
- "id": "constant/B.JavaScriptObject_methods = J.JavaScriptObject.prototype;\n",
- "kind": "constant",
- "name": "",
- "size": 59,
- "outputUnit": "outputUnit/main",
- "code": "B.JavaScriptObject_methods = J.JavaScriptObject.prototype;\n"
-}],
- deferredFiles=[{
- "main.dart": {
- "name": "<unnamed>",
- "imports": {
- "lib": [
- "out_1.part.js"
- ]
- }
- }
-}],
- dependencies=[{}],
- library=[{
- "id": "library/memory:sdk/tests/web/native/main.dart::",
- "kind": "library",
- "name": "<unnamed>",
- "size": 301,
- "children": [
- "function/memory:sdk/tests/web/native/main.dart::main"
- ],
- "canonicalUri": "memory:sdk/tests/web/native/main.dart"
-}],
- outputUnits=[
- {
- "id": "outputUnit/1",
- "kind": "outputUnit",
- "name": "1",
- "size": 1087,
- "filename": "out_1.part.js",
- "imports": [
- "lib"
- ]
-},
- {
- "id": "outputUnit/main",
- "kind": "outputUnit",
- "name": "main",
- "filename": "out",
- "imports": []
-}]
-*/
-
-/*canary.library:
+/*library:
constant=[
{
"id": "constant/B.C_Deferred = A.lib__funky$closure();\n",
diff --git a/pkg/compiler/test/dump_info/data/deferred_future/main.dart b/pkg/compiler/test/dump_info/data/deferred_future/main.dart
index f9347fc..ed843d7 100644
--- a/pkg/compiler/test/dump_info/data/deferred_future/main.dart
+++ b/pkg/compiler/test/dump_info/data/deferred_future/main.dart
@@ -110,7 +110,7 @@
"id": "outputUnit/1",
"kind": "outputUnit",
"name": "1",
- "size": 870,
+ "size": 846,
"filename": "out_1.part.js",
"imports": [
"lib1"
