Skip to content

Commit 7ebd4dd

Browse files
alexmarkovCommit Queue
authored and
Commit Queue
committed
[3.0 alpha] Remove deprecated public class CyclicInitializationError
This deprecated class cannot be removed just yet because we still need to throw something in case of cyclic initialization in Dart legacy libraries (which are still supported). Class CyclicInitializationError is copied for each implementation (VM, dart2js and DDC) and made private. Each implementation now has an independent private class which can be removed separately. TEST=ci Issue: #49529 Change-Id: I8100bbe16636c12c4cbabbb5fe770f4c648c4249 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/275120 Commit-Queue: Michael Thomsen <[email protected]> Reviewed-by: Lasse Nielsen <[email protected]> Reviewed-by: Siva Annamalai <[email protected]> Reviewed-by: Sigmund Cherem <[email protected]> Reviewed-by: Johnni Winther <[email protected]>
1 parent 822d15e commit 7ebd4dd

File tree

17 files changed

+70
-342
lines changed

17 files changed

+70
-342
lines changed

pkg/front_end/testcases/general/error_export_from_dill/main.dart.weak.expect

-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ additionalExports = (core::Deprecated,
117117
core::ConcurrentModificationError,
118118
core::OutOfMemoryError,
119119
core::StackOverflowError,
120-
core::CyclicInitializationError,
121120
core::Exception,
122121
core::FormatException,
123122
core::IntegerDivisionByZeroException,

pkg/front_end/testcases/general/error_export_from_dill/main.dart.weak.outline.expect

-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ additionalExports = (core::Deprecated,
5252
core::ConcurrentModificationError,
5353
core::OutOfMemoryError,
5454
core::StackOverflowError,
55-
core::CyclicInitializationError,
5655
core::Exception,
5756
core::FormatException,
5857
core::IntegerDivisionByZeroException,

pkg/front_end/testcases/general/error_export_from_dill/main.dart.weak.transformed.expect

-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ additionalExports = (core::Deprecated,
113113
core::ConcurrentModificationError,
114114
core::OutOfMemoryError,
115115
core::StackOverflowError,
116-
core::CyclicInitializationError,
117116
core::Exception,
118117
core::FormatException,
119118
core::IntegerDivisionByZeroException,

pkg/front_end/testcases/incremental/export_core.yaml.world.2.expect

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ additionalExports = (asy::Future,
1616
core::CastError,
1717
core::Comparable,
1818
core::ConcurrentModificationError,
19-
core::CyclicInitializationError,
2019
core::DateTime,
2120
core::DateTimeCopyWith,
2221
core::Deprecated,

pkg/front_end/testcases/incremental/export_core.yaml.world.3.expect

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ additionalExports = (asy::Future,
1616
core::CastError,
1717
core::Comparable,
1818
core::ConcurrentModificationError,
19-
core::CyclicInitializationError,
2019
core::DateTime,
2120
core::DateTimeCopyWith,
2221
core::Deprecated,

runtime/tools/dartfuzz/dartfuzz.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import 'dartfuzz_type_table.dart';
1414
// Version of DartFuzz. Increase this each time changes are made
1515
// to preserve the property that a given version of DartFuzz yields
1616
// the same fuzzed program for a deterministic random seed.
17-
const String version = '1.95';
17+
const String version = '1.96';
1818

1919
// Restriction on statements and expressions.
2020
const int stmtDepth = 1;

runtime/tools/dartfuzz/dartfuzz_api_table.dart

-10
Original file line numberDiff line numberDiff line change
@@ -2012,14 +2012,10 @@ class DartLib {
20122012
true),
20132013
DartLib('toLowerCase', [DartType.STRING, DartType.VOID], true),
20142014
DartLib('toRadixString', [DartType.INT, DartType.INT], true),
2015-
DartLib('toString',
2016-
[DartType.ABSTRACTCLASSINSTANTIATIONERROR, DartType.VOID], true),
20172015
DartLib('toString', [DartType.ARGUMENTERROR, DartType.VOID], true),
20182016
DartLib('toString', [DartType.BOOL, DartType.VOID], true),
20192017
DartLib('toString', [DartType.CONCURRENTMODIFICATIONERROR, DartType.VOID],
20202018
true),
2021-
DartLib(
2022-
'toString', [DartType.CYCLICINITIALIZATIONERROR, DartType.VOID], true),
20232019
DartLib('toString', [DartType.DEPRECATED, DartType.VOID], true),
20242020
DartLib('toString', [DartType.DOUBLE, DartType.VOID], true),
20252021
DartLib('toString', [DartType.DOUBLE, DartType.VOID], true),
@@ -2085,14 +2081,10 @@ class DartLib {
20852081
true),
20862082
DartLib('toLowerCase', [DartType.STRING, DartType.VOID], true),
20872083
DartLib('toRadixString', [DartType.INT, DartType.INT], true),
2088-
DartLib('toString',
2089-
[DartType.ABSTRACTCLASSINSTANTIATIONERROR, DartType.VOID], true),
20902084
DartLib('toString', [DartType.ARGUMENTERROR, DartType.VOID], true),
20912085
DartLib('toString', [DartType.BOOL, DartType.VOID], true),
20922086
DartLib('toString', [DartType.CONCURRENTMODIFICATIONERROR, DartType.VOID],
20932087
true),
2094-
DartLib(
2095-
'toString', [DartType.CYCLICINITIALIZATIONERROR, DartType.VOID], true),
20962088
DartLib('toString', [DartType.DEPRECATED, DartType.VOID], true),
20972089
DartLib('toString', [DartType.DOUBLE, DartType.VOID], true),
20982090
DartLib('toString', [DartType.DOUBLE, DartType.VOID], true),
@@ -2118,8 +2110,6 @@ class DartLib {
21182110
DartLib('trim', [DartType.STRING, DartType.VOID], true),
21192111
DartLib('trimLeft', [DartType.STRING, DartType.VOID], true),
21202112
DartLib('trimRight', [DartType.STRING, DartType.VOID], true),
2121-
DartLib('variableName', [DartType.CYCLICINITIALIZATIONERROR, DartType.VOID],
2122-
false),
21232113
];
21242114
static const symbolLibs = [
21252115
DartLib('Symbol.empty', [DartType.VOID, DartType.VOID], false),

0 commit comments

Comments
 (0)