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

Commit df1593e

Browse files
zandersozanderso
authored
Rolls clang to 725656bdd885483c39f482a01ea25d67acf39c46 (#49248)
We're on a version of clang that crashes a lot on macOS. This PR rolls clang forward to a new release from the Fuchsia toolchain team. If it does not fix the crash, we can roll back with #49249. Both rolling forward and back require the fixes to the `.mm` file in this PR.
1 parent 9e4afd5 commit df1593e

File tree

2 files changed

+40
-1
lines changed

2 files changed

+40
-1
lines changed

‎DEPS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ vars = {
4646
# updates to Clang Tidy will not turn the tree red.
4747
#
4848
# See https://github.com/flutter/flutter/wiki/Engine-pre‐submits-and-post‐submits#post-submit
49-
'clang_version': 'git_revision:00396e6a1a0b79fda008cb4e86b616d7952b33c8',
49+
'clang_version': 'git_revision:725656bdd885483c39f482a01ea25d67acf39c46',
5050

5151
# The goma version and the clang version can be tightly coupled. If goma
5252
# stops working on a clang roll, this may need to be updated using the value

‎shell/platform/darwin/ios/framework/Source/FlutterEmbedderKeyResponderTest.mm‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ - (void)testBasicKeyEvent API_AVAILABLE(ios(13.4)) {
146146

147147
XCTAssertEqual([events count], 1u);
148148
event = [events lastObject].data;
149+
XCTAssertNotEqual(event, nullptr);
149150
XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
150151
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
151152
XCTAssertEqual(event->timestamp, 123000000.0f);
@@ -169,6 +170,7 @@ - (void)testBasicKeyEvent API_AVAILABLE(ios(13.4)) {
169170

170171
XCTAssertEqual([events count], 1u);
171172
event = [events lastObject].data;
173+
XCTAssertNotEqual(event, nullptr);
172174
XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
173175
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
174176
XCTAssertEqual(event->timestamp, 123000000.0f);
@@ -208,6 +210,7 @@ - (void)testIosKeyPlane API_AVAILABLE(ios(13.4)) {
208210

209211
XCTAssertEqual([events count], 1u);
210212
event = [events lastObject].data;
213+
XCTAssertNotEqual(event, nullptr);
211214
XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
212215
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
213216
XCTAssertEqual(event->physical, kKeyCodeEject | kIosPlane);
@@ -230,6 +233,7 @@ - (void)testIosKeyPlane API_AVAILABLE(ios(13.4)) {
230233

231234
XCTAssertEqual([events count], 1u);
232235
event = [events lastObject].data;
236+
XCTAssertNotEqual(event, nullptr);
233237
XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
234238
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
235239
XCTAssertEqual(event->physical, kKeyCodeEject | kIosPlane);
@@ -265,6 +269,7 @@ - (void)testOutOfOrderModifiers API_AVAILABLE(ios(13.4)) {
265269

266270
XCTAssertEqual([events count], 1u);
267271
event = [events lastObject].data;
272+
XCTAssertNotEqual(event, nullptr);
268273
XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
269274
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
270275
XCTAssertEqual(event->physical, kPhysicalAltRight);
@@ -281,6 +286,7 @@ - (void)testOutOfOrderModifiers API_AVAILABLE(ios(13.4)) {
281286

282287
XCTAssertEqual([events count], 1u);
283288
event = [events lastObject].data;
289+
XCTAssertNotEqual(event, nullptr);
284290
XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
285291
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
286292
XCTAssertEqual(event->physical, kPhysicalKeyW);
@@ -298,6 +304,7 @@ - (void)testOutOfOrderModifiers API_AVAILABLE(ios(13.4)) {
298304

299305
XCTAssertEqual([events count], 1u);
300306
event = [events lastObject].data;
307+
XCTAssertNotEqual(event, nullptr);
301308
XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
302309
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
303310
XCTAssertEqual(event->physical, kPhysicalAltRight);
@@ -318,6 +325,7 @@ - (void)testOutOfOrderModifiers API_AVAILABLE(ios(13.4)) {
318325

319326
XCTAssertEqual([events count], 1u);
320327
event = [events lastObject].data;
328+
XCTAssertNotEqual(event, nullptr);
321329
XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
322330
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
323331
XCTAssertEqual(event->physical, kPhysicalKeyW);
@@ -335,6 +343,7 @@ - (void)testOutOfOrderModifiers API_AVAILABLE(ios(13.4)) {
335343

336344
XCTAssertEqual([events count], 1u);
337345
event = [events lastObject].data;
346+
XCTAssertNotEqual(event, nullptr);
338347
XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
339348
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
340349
XCTAssertEqual(event->physical, kPhysicalKeyA);
@@ -364,6 +373,7 @@ - (void)testIgnoreDuplicateDownEvent API_AVAILABLE(ios(13.4)) {
364373

365374
XCTAssertEqual([events count], 1u);
366375
event = [events lastObject].data;
376+
XCTAssertNotEqual(event, nullptr);
367377
XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
368378
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
369379
XCTAssertEqual(event->physical, kPhysicalKeyA);
@@ -384,6 +394,7 @@ - (void)testIgnoreDuplicateDownEvent API_AVAILABLE(ios(13.4)) {
384394

385395
XCTAssertEqual([events count], 1u);
386396
event = [events lastObject].data;
397+
XCTAssertNotEqual(event, nullptr);
387398
XCTAssertEqual(event->physical, 0ull);
388399
XCTAssertEqual(event->logical, 0ull);
389400
XCTAssertEqual(event->synthesized, false);
@@ -400,6 +411,7 @@ - (void)testIgnoreDuplicateDownEvent API_AVAILABLE(ios(13.4)) {
400411

401412
XCTAssertEqual([events count], 1u);
402413
event = [events lastObject].data;
414+
XCTAssertNotEqual(event, nullptr);
403415
XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
404416
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
405417
XCTAssertEqual(event->physical, kPhysicalKeyA);
@@ -434,6 +446,7 @@ - (void)testIgnoreAbruptUpEvent API_AVAILABLE(ios(13.4)) {
434446

435447
XCTAssertEqual([events count], 1u);
436448
event = [events lastObject].data;
449+
XCTAssertNotEqual(event, nullptr);
437450
XCTAssertEqual(event->physical, 0ull);
438451
XCTAssertEqual(event->logical, 0ull);
439452
XCTAssertEqual(event->synthesized, false);
@@ -466,6 +479,7 @@ - (void)testToggleModifiersDuringKeyTap API_AVAILABLE(ios(13.4)) {
466479
XCTAssertEqual([events count], 1u);
467480

468481
event = [events lastObject].data;
482+
XCTAssertNotEqual(event, nullptr);
469483
XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
470484
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
471485
XCTAssertEqual(event->timestamp, 123000000.0f);
@@ -483,6 +497,7 @@ - (void)testToggleModifiersDuringKeyTap API_AVAILABLE(ios(13.4)) {
483497

484498
XCTAssertEqual([events count], 1u);
485499
event = [events lastObject].data;
500+
XCTAssertNotEqual(event, nullptr);
486501
XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
487502
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
488503
XCTAssertEqual(event->physical, kPhysicalKeyA);
@@ -499,6 +514,7 @@ - (void)testToggleModifiersDuringKeyTap API_AVAILABLE(ios(13.4)) {
499514

500515
XCTAssertEqual([events count], 1u);
501516
event = [events lastObject].data;
517+
XCTAssertNotEqual(event, nullptr);
502518
XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
503519
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
504520
XCTAssertEqual(event->physical, kPhysicalShiftRight);
@@ -515,6 +531,7 @@ - (void)testToggleModifiersDuringKeyTap API_AVAILABLE(ios(13.4)) {
515531

516532
XCTAssertEqual([events count], 1u);
517533
event = [events lastObject].data;
534+
XCTAssertNotEqual(event, nullptr);
518535
XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
519536
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
520537
XCTAssertEqual(event->physical, kPhysicalKeyA);
@@ -557,6 +574,7 @@ - (void)testSpecialModiferFlags API_AVAILABLE(ios(13.4)) {
557574

558575
XCTAssertEqual([events count], 1u);
559576
event = [events lastObject].data;
577+
XCTAssertNotEqual(event, nullptr);
560578
XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
561579
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
562580
XCTAssertEqual(event->physical, kPhysicalNumpad1);
@@ -574,6 +592,7 @@ - (void)testSpecialModiferFlags API_AVAILABLE(ios(13.4)) {
574592

575593
XCTAssertEqual([events count], 1u);
576594
event = [events lastObject].data;
595+
XCTAssertNotEqual(event, nullptr);
577596
XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
578597
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
579598
XCTAssertEqual(event->physical, kPhysicalKeyUndefined);
@@ -591,6 +610,7 @@ - (void)testSpecialModiferFlags API_AVAILABLE(ios(13.4)) {
591610

592611
XCTAssertEqual([events count], 1u);
593612
event = [events lastObject].data;
613+
XCTAssertNotEqual(event, nullptr);
594614
XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
595615
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
596616
XCTAssertEqual(event->physical, kPhysicalF1);
@@ -608,6 +628,7 @@ - (void)testSpecialModiferFlags API_AVAILABLE(ios(13.4)) {
608628

609629
XCTAssertEqual([events count], 1u);
610630
event = [events lastObject].data;
631+
XCTAssertNotEqual(event, nullptr);
611632
XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
612633
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
613634
XCTAssertEqual(event->physical, kPhysicalKeyA);
@@ -625,6 +646,7 @@ - (void)testSpecialModiferFlags API_AVAILABLE(ios(13.4)) {
625646

626647
XCTAssertEqual([events count], 1u);
627648
event = [events lastObject].data;
649+
XCTAssertNotEqual(event, nullptr);
628650
XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
629651
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
630652
XCTAssertEqual(event->physical, kPhysicalShiftLeft);
@@ -644,6 +666,7 @@ - (void)testSpecialModiferFlags API_AVAILABLE(ios(13.4)) {
644666
// Because the OS no longer provides the 0x20000 (kModifierFlagShiftAny), we
645667
// have to simulate a keyup.
646668
event = [events firstObject].data;
669+
XCTAssertNotEqual(event, nullptr);
647670
XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
648671
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
649672
XCTAssertEqual(event->physical, kPhysicalShiftLeft);
@@ -652,6 +675,7 @@ - (void)testSpecialModiferFlags API_AVAILABLE(ios(13.4)) {
652675
XCTAssertEqual(event->synthesized, true);
653676

654677
event = [events lastObject].data;
678+
XCTAssertNotEqual(event, nullptr);
655679
XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
656680
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
657681
XCTAssertEqual(event->physical, kPhysicalNumpad1);
@@ -669,6 +693,7 @@ - (void)testSpecialModiferFlags API_AVAILABLE(ios(13.4)) {
669693

670694
XCTAssertEqual([events count], 1u);
671695
event = [events lastObject].data;
696+
XCTAssertNotEqual(event, nullptr);
672697
XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
673698
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
674699
XCTAssertEqual(event->physical, kPhysicalF1);
@@ -686,6 +711,7 @@ - (void)testSpecialModiferFlags API_AVAILABLE(ios(13.4)) {
686711

687712
XCTAssertEqual([events count], 1u);
688713
event = [events lastObject].data;
714+
XCTAssertNotEqual(event, nullptr);
689715
XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
690716
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
691717
XCTAssertEqual(event->physical, kPhysicalKeyUndefined);
@@ -702,6 +728,7 @@ - (void)testSpecialModiferFlags API_AVAILABLE(ios(13.4)) {
702728

703729
XCTAssertEqual([events count], 1u);
704730
event = [events lastObject].data;
731+
XCTAssertNotEqual(event, nullptr);
705732
XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
706733
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
707734
XCTAssertEqual(event->physical, kPhysicalKeyA);
@@ -719,6 +746,7 @@ - (void)testSpecialModiferFlags API_AVAILABLE(ios(13.4)) {
719746

720747
XCTAssertEqual([events count], 1u);
721748
event = [events lastObject].data;
749+
XCTAssertNotEqual(event, nullptr);
722750
XCTAssertEqual(event->physical, 0ull);
723751
XCTAssertEqual(event->logical, 0ull);
724752
XCTAssertEqual(event->synthesized, false);
@@ -746,6 +774,7 @@ - (void)testIdentifyLeftAndRightModifiers API_AVAILABLE(ios(13.4)) {
746774

747775
XCTAssertEqual([events count], 1u);
748776
event = [events lastObject].data;
777+
XCTAssertNotEqual(event, nullptr);
749778
XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
750779
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
751780
XCTAssertEqual(event->physical, kPhysicalShiftLeft);
@@ -762,6 +791,7 @@ - (void)testIdentifyLeftAndRightModifiers API_AVAILABLE(ios(13.4)) {
762791

763792
XCTAssertEqual([events count], 1u);
764793
event = [events lastObject].data;
794+
XCTAssertNotEqual(event, nullptr);
765795
XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
766796
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
767797
XCTAssertEqual(event->physical, kPhysicalShiftRight);
@@ -778,6 +808,7 @@ - (void)testIdentifyLeftAndRightModifiers API_AVAILABLE(ios(13.4)) {
778808

779809
XCTAssertEqual([events count], 1u);
780810
event = [events lastObject].data;
811+
XCTAssertNotEqual(event, nullptr);
781812
XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
782813
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
783814
XCTAssertEqual(event->physical, kPhysicalShiftLeft);
@@ -794,6 +825,7 @@ - (void)testIdentifyLeftAndRightModifiers API_AVAILABLE(ios(13.4)) {
794825

795826
XCTAssertEqual([events count], 1u);
796827
event = [events lastObject].data;
828+
XCTAssertNotEqual(event, nullptr);
797829
XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
798830
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
799831
XCTAssertEqual(event->physical, kPhysicalShiftRight);
@@ -829,6 +861,7 @@ - (void)testSynchronizeCapsLockStateOnCapsLock API_AVAILABLE(ios(13.4)) {
829861
XCTAssertEqual([events count], 3u);
830862

831863
event = events[0].data;
864+
XCTAssertNotEqual(event, nullptr);
832865
XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
833866
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
834867
XCTAssertEqual(event->physical, kPhysicalCapsLock);
@@ -838,6 +871,7 @@ - (void)testSynchronizeCapsLockStateOnCapsLock API_AVAILABLE(ios(13.4)) {
838871
XCTAssertFalse([events[0] hasCallback]);
839872

840873
event = events[1].data;
874+
XCTAssertNotEqual(event, nullptr);
841875
XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
842876
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
843877
XCTAssertEqual(event->physical, kPhysicalCapsLock);
@@ -847,6 +881,7 @@ - (void)testSynchronizeCapsLockStateOnCapsLock API_AVAILABLE(ios(13.4)) {
847881
XCTAssertFalse([events[1] hasCallback]);
848882

849883
event = events[2].data;
884+
XCTAssertNotEqual(event, nullptr);
850885
XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
851886
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
852887
XCTAssertEqual(event->physical, kPhysicalKeyA);
@@ -866,6 +901,7 @@ - (void)testSynchronizeCapsLockStateOnCapsLock API_AVAILABLE(ios(13.4)) {
866901
callback:keyEventCallback];
867902
XCTAssertEqual([events count], 1u);
868903
event = [events lastObject].data;
904+
XCTAssertNotEqual(event, nullptr);
869905
XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
870906
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
871907
XCTAssertEqual(event->physical, kPhysicalKeyA);
@@ -882,6 +918,7 @@ - (void)testSynchronizeCapsLockStateOnCapsLock API_AVAILABLE(ios(13.4)) {
882918

883919
XCTAssertEqual([events count], 1u);
884920
event = [events firstObject].data;
921+
XCTAssertNotEqual(event, nullptr);
885922
XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
886923
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
887924
XCTAssertEqual(event->physical, kPhysicalCapsLock);
@@ -902,6 +939,7 @@ - (void)testSynchronizeCapsLockStateOnCapsLock API_AVAILABLE(ios(13.4)) {
902939

903940
XCTAssertEqual([events count], 1u);
904941
event = [events firstObject].data;
942+
XCTAssertNotEqual(event, nullptr);
905943
XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
906944
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
907945
XCTAssertEqual(event->physical, kPhysicalCapsLock);
@@ -920,6 +958,7 @@ - (void)testSynchronizeCapsLockStateOnCapsLock API_AVAILABLE(ios(13.4)) {
920958
// consistent, and should be off.
921959
XCTAssertEqual([events count], 1u);
922960
event = [events lastObject].data;
961+
XCTAssertNotEqual(event, nullptr);
923962
XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
924963
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
925964
XCTAssertEqual(event->physical, kPhysicalKeyA);

0 commit comments

Comments
 (0)