Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 5db4b37

Browse files
cbrackencbracken
authored
Revert dart rolls (#7913)
* Roll back three Dart SDK rolls Revert "Roll src/third_party/dart 75ee523..4cff5a4 (6 commits)" Revert "Roll src/third_party/dart 5ddd157..75ee523 (19 commits)" Revert "Roll src/third_party/dart c92d5ca..5ddd157 (153 commits)" `pub upgrade` appears to fail 100% reproducibly on broken on Windows. This rollback rolls back both what appears to be the breaking roll (61fc178) and the following roll. This reverts commit 0053c1d. This reverts commit 1cf6b8b. This reverts commit 61fc178. * Revert "Revert "Revert "Remove unnecessary entry-point closurization. (#7827)" (#7876)" (#7904)" This reverts commit 93eeb48.
1 parent 3f0ce76 commit 5db4b37

File tree

5 files changed

+20
-23
lines changed

5 files changed

+20
-23
lines changed

‎DEPS‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ vars = {
3131
# Dart is: https://github.com/dart-lang/sdk/blob/master/DEPS.
3232
# You can use //tools/dart/create_updated_flutter_deps.py to produce
3333
# updated revision list of existing dependencies.
34-
'dart_revision': '4cff5a4fd6a02c5c4277a9087e6fb69052b120f9',
34+
'dart_revision': 'c92d5ca288da15b54b04c0a40ffe5d94a8883d77',
3535

3636
# WARNING: DO NOT EDIT MANUALLY
3737
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -47,9 +47,9 @@ vars = {
4747
'dart_convert_tag': '2.0.2',
4848
'dart_crypto_tag': '2.0.6',
4949
'dart_csslib_tag': '0.14.4+1',
50-
'dart_dart2js_info_tag': '0.6.0',
50+
'dart_dart2js_info_tag': '0.5.15',
5151
'dart_dart_style_tag': '1.2.2',
52-
'dart_dartdoc_tag': 'v0.28.2',
52+
'dart_dartdoc_tag': 'v0.28.1+2',
5353
'dart_fixnum_tag': '0.10.9',
5454
'dart_glob_tag': '1.1.7',
5555
'dart_html_tag': '0.13.3+2',

‎ci/licenses_golden/licenses_third_party‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 049b7971585ead7ab4f23b8bdf29853f
1+
Signature: a76c88a9ff389b1401e9df71fb13c1f6
22

33
UNUSED LICENSES:
44

@@ -5707,8 +5707,6 @@ FILE: ../../../third_party/dart/runtime/lib/ffi_dynamic_library.cc
57075707
FILE: ../../../third_party/dart/runtime/lib/ffi_dynamic_library_patch.dart
57085708
FILE: ../../../third_party/dart/runtime/lib/ffi_native_type_patch.dart
57095709
FILE: ../../../third_party/dart/runtime/lib/ffi_patch.dart
5710-
FILE: ../../../third_party/dart/runtime/tools/graphexplorer/graphexplorer.html
5711-
FILE: ../../../third_party/dart/runtime/tools/graphexplorer/graphexplorer.js
57125710
FILE: ../../../third_party/dart/runtime/vm/class_id.h
57135711
FILE: ../../../third_party/dart/runtime/vm/code_entry_kind.h
57145712
FILE: ../../../third_party/dart/runtime/vm/compiler/asm_intrinsifier.cc
@@ -5753,7 +5751,6 @@ FILE: ../../../third_party/dart/runtime/vm/type_testing_stubs_arm.cc
57535751
FILE: ../../../third_party/dart/runtime/vm/type_testing_stubs_arm64.cc
57545752
FILE: ../../../third_party/dart/runtime/vm/type_testing_stubs_x64.cc
57555753
FILE: ../../../third_party/dart/samples/ffi/coordinate.dart
5756-
FILE: ../../../third_party/dart/samples/ffi/dylib_utils.dart
57575754
FILE: ../../../third_party/dart/samples/ffi/sample_ffi_data.dart
57585755
FILE: ../../../third_party/dart/samples/ffi/sample_ffi_dynamic_library.dart
57595756
FILE: ../../../third_party/dart/samples/ffi/sample_ffi_functions.dart

‎lib/stub_ui/natives.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Future<developer.ServiceExtensionResponse> _scheduleFrame(
2020
}));
2121
}
2222

23-
@pragma('vm:entry-point', 'call')
23+
@pragma('vm:entry-point')
2424
void _setupHooks() { // ignore: unused_element
2525
assert(() {
2626
// In debug mode, register the schedule frame extension.

‎lib/ui/hooks.dart‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dynamic _decodeJSON(String message) {
1616
return message != null ? json.decode(message) : null;
1717
}
1818

19-
@pragma('vm:entry-point', 'call')
19+
@pragma('vm:entry-point')
2020
// ignore: unused_element
2121
void _updateWindowMetrics(double devicePixelRatio,
2222
double width,
@@ -54,11 +54,11 @@ String _localeClosure() {
5454
return window.locale.toString();
5555
}
5656

57-
@pragma('vm:entry-point', 'call')
57+
@pragma('vm:entry-point')
5858
// ignore: unused_element
5959
_LocaleClosure _getLocaleClosure() => _localeClosure;
6060

61-
@pragma('vm:entry-point', 'call')
61+
@pragma('vm:entry-point')
6262
// ignore: unused_element
6363
void _updateLocales(List<String> locales) {
6464
const int stringsPerLocale = 4;
@@ -77,7 +77,7 @@ void _updateLocales(List<String> locales) {
7777
_invoke(window.onLocaleChanged, window._onLocaleChangedZone);
7878
}
7979

80-
@pragma('vm:entry-point', 'call')
80+
@pragma('vm:entry-point')
8181
// ignore: unused_element
8282
void _updateUserSettingsData(String jsonData) {
8383
final Map<String, dynamic> data = json.decode(jsonData);
@@ -103,14 +103,14 @@ void _updatePlatformBrightness(String brightnessName) {
103103
_invoke(window.onPlatformBrightnessChanged, window._onPlatformBrightnessChangedZone);
104104
}
105105

106-
@pragma('vm:entry-point', 'call')
106+
@pragma('vm:entry-point')
107107
// ignore: unused_element
108108
void _updateSemanticsEnabled(bool enabled) {
109109
window._semanticsEnabled = enabled;
110110
_invoke(window.onSemanticsEnabledChanged, window._onSemanticsEnabledChangedZone);
111111
}
112112

113-
@pragma('vm:entry-point', 'call')
113+
@pragma('vm:entry-point')
114114
// ignore: unused_element
115115
void _updateAccessibilityFeatures(int values) {
116116
final AccessibilityFeatures newFeatures = new AccessibilityFeatures._(values);
@@ -120,7 +120,7 @@ void _updateAccessibilityFeatures(int values) {
120120
_invoke(window.onAccessibilityFeaturesChanged, window._onAccessibilityFlagsChangedZone);
121121
}
122122

123-
@pragma('vm:entry-point', 'call')
123+
@pragma('vm:entry-point')
124124
void _dispatchPlatformMessage(String name, ByteData data, int responseId) {
125125
if (window.onPlatformMessage != null) {
126126
_invoke3<String, ByteData, PlatformMessageResponseCallback>(
@@ -137,14 +137,14 @@ void _dispatchPlatformMessage(String name, ByteData data, int responseId) {
137137
}
138138
}
139139

140-
@pragma('vm:entry-point', 'call')
140+
@pragma('vm:entry-point')
141141
// ignore: unused_element
142142
void _dispatchPointerDataPacket(ByteData packet) {
143143
if (window.onPointerDataPacket != null)
144144
_invoke1<PointerDataPacket>(window.onPointerDataPacket, window._onPointerDataPacketZone, _unpackPointerDataPacket(packet));
145145
}
146146

147-
@pragma('vm:entry-point', 'call')
147+
@pragma('vm:entry-point')
148148
// ignore: unused_element
149149
void _dispatchSemanticsAction(int id, int action, ByteData args) {
150150
_invoke3<int, SemanticsAction, ByteData>(
@@ -156,13 +156,13 @@ void _dispatchSemanticsAction(int id, int action, ByteData args) {
156156
);
157157
}
158158

159-
@pragma('vm:entry-point', 'call')
159+
@pragma('vm:entry-point')
160160
// ignore: unused_element
161161
void _beginFrame(int microseconds) {
162162
_invoke1<Duration>(window.onBeginFrame, window._onBeginFrameZone, new Duration(microseconds: microseconds));
163163
}
164164

165-
@pragma('vm:entry-point', 'call')
165+
@pragma('vm:entry-point')
166166
// ignore: unused_element
167167
void _drawFrame() {
168168
_invoke(window.onDrawFrame, window._onDrawFrameZone);
@@ -173,7 +173,7 @@ typedef _UnaryFunction(Null args);
173173
// ignore: always_declare_return_types, prefer_generic_function_type_aliases
174174
typedef _BinaryFunction(Null args, Null message);
175175

176-
@pragma('vm:entry-point', 'call')
176+
@pragma('vm:entry-point')
177177
// ignore: unused_element
178178
void _runMainZoned(Function startMainIsolateFunction, Function userMainFunction) {
179179
startMainIsolateFunction((){

‎lib/ui/natives.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Future<developer.ServiceExtensionResponse> _scheduleFrame(
2929
}));
3030
}
3131

32-
@pragma('vm:entry-point', 'call')
32+
@pragma('vm:entry-point')
3333
void _setupHooks() { // ignore: unused_element
3434
assert(() {
3535
// In debug mode, register the schedule frame extension.
@@ -71,7 +71,7 @@ Function _getCallbackFromHandle(int handle) native 'GetCallbackFromHandle';
7171
// Required for gen_snapshot to work correctly.
7272
int _isolateId; // ignore: unused_element
7373

74-
@pragma('vm:entry-point', 'call')
74+
@pragma('vm:entry-point')
7575
Function _getPrintClosure() => _print; // ignore: unused_element
76-
@pragma('vm:entry-point', 'call')
76+
@pragma('vm:entry-point')
7777
Function _getScheduleMicrotaskClosure() => _scheduleMicrotask; // ignore: unused_element

0 commit comments

Comments
 (0)