Skip to content

Commit 3102ed0

Browse files
CodaFiCodaFi
committed
Remove regression tests for the dead size heuristic
1 parent 6115ed9 commit 3102ed0

File tree

2 files changed

+19
-203
lines changed

2 files changed

+19
-203
lines changed

‎test/Compatibility/exhaustive_switch.swift

Lines changed: 19 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -432,10 +432,6 @@ enum OverlyLargeSpaceEnum {
432432
case case9
433433
case case10
434434
case case11
435-
case case12
436-
case case13
437-
case case14
438-
case case15
439435
}
440436

441437
enum ContainsOverlyLargeEnum {
@@ -445,8 +441,8 @@ enum ContainsOverlyLargeEnum {
445441
}
446442

447443
func quiteBigEnough() -> Bool {
448-
switch (OverlyLargeSpaceEnum.case1, OverlyLargeSpaceEnum.case2) { // expected-error {{the compiler is unable to check that this switch is exhaustive in reasonable time}}
449-
// expected-note@-1 {{do you want to add a default clause?}}
444+
switch (OverlyLargeSpaceEnum.case1, OverlyLargeSpaceEnum.case2) { // expected-error {{switch must be exhaustive}}
445+
// expected-note@-1 132 {{add missing case:}}
450446
case (.case0, .case0): return true
451447
case (.case1, .case1): return true
452448
case (.case2, .case2): return true
@@ -459,13 +455,10 @@ func quiteBigEnough() -> Bool {
459455
case (.case9, .case9): return true
460456
case (.case10, .case10): return true
461457
case (.case11, .case11): return true
462-
case (.case12, .case12): return true
463-
case (.case13, .case13): return true
464-
case (.case14, .case14): return true
465-
case (.case15, .case15): return true
466458
}
467459

468-
switch (OverlyLargeSpaceEnum.case1, OverlyLargeSpaceEnum.case2) {
460+
switch (OverlyLargeSpaceEnum.case1, OverlyLargeSpaceEnum.case2) { // expected-error {{switch must be exhaustive}}
461+
// expected-note@-1 {{add missing case: '(.case11, _)'}}
469462
case (.case0, _): return true
470463
case (.case1, _): return true
471464
case (.case2, _): return true
@@ -477,31 +470,22 @@ func quiteBigEnough() -> Bool {
477470
case (.case8, _): return true
478471
case (.case9, _): return true
479472
case (.case10, _): return true
480-
case (.case11, _): return true
481-
case (.case12, _): return true
482-
case (.case13, _): return true
483-
case (.case14, _): return true
484-
case (.case15, _): return true
485473
}
486474

487-
switch (OverlyLargeSpaceEnum.case1, OverlyLargeSpaceEnum.case2) { // expected-error {{the compiler is unable to check that this switch is exhaustive in reasonable time}}
488-
case (.case0, .case0): return true
489-
case (.case1, .case1): return true
490-
case (.case2, .case2): return true
491-
case (.case3, .case3): return true
492-
case (.case4, .case4): return true
493-
case (.case5, .case5): return true
494-
case (.case6, .case6): return true
495-
case (.case7, .case7): return true
496-
case (.case8, .case8): return true
497-
case (.case9, .case9): return true
498-
case (.case10, .case10): return true
499-
case (.case11, .case11): return true
500-
case (.case12, .case12): return true
501-
case (.case13, .case13): return true
502-
case (.case14, .case14): return true
503-
case (.case15, .case15): return true
504-
@unknown default: return false // expected-note {{remove '@unknown' to handle remaining values}} {{3-12=}}
475+
switch (OverlyLargeSpaceEnum.case1, OverlyLargeSpaceEnum.case2) { // expected-warning {{switch must be exhaustive}}
476+
// expected-note@-1 {{add missing case: '(.case11, _)'}}
477+
case (.case0, _): return true
478+
case (.case1, _): return true
479+
case (.case2, _): return true
480+
case (.case3, _): return true
481+
case (.case4, _): return true
482+
case (.case5, _): return true
483+
case (.case6, _): return true
484+
case (.case7, _): return true
485+
case (.case8, _): return true
486+
case (.case9, _): return true
487+
case (.case10, _): return true
488+
@unknown default: return false
505489
}
506490

507491

@@ -519,10 +503,6 @@ func quiteBigEnough() -> Bool {
519503
case (.case9, _): return true
520504
case (.case10, _): return true
521505
case (.case11, _): return true
522-
case (.case12, _): return true
523-
case (.case13, _): return true
524-
case (.case14, _): return true
525-
case (.case15, _): return true
526506
}
527507

528508
// No diagnostic
@@ -539,10 +519,6 @@ func quiteBigEnough() -> Bool {
539519
case (_, .case9): return true
540520
case (_, .case10): return true
541521
case (_, .case11): return true
542-
case (_, .case12): return true
543-
case (_, .case13): return true
544-
case (_, .case14): return true
545-
case (_, .case15): return true
546522
}
547523

548524
// No diagnostic
@@ -567,7 +543,7 @@ func quiteBigEnough() -> Bool {
567543
}
568544

569545
// Make sure we haven't just stopped emitting diagnostics.
570-
switch OverlyLargeSpaceEnum.case1 { // expected-error {{switch must be exhaustive}} expected-note 16 {{add missing case}}
546+
switch OverlyLargeSpaceEnum.case1 { // expected-error {{switch must be exhaustive}} expected-note 12 {{add missing case}}
571547
}
572548
}
573549

‎test/Sema/exhaustive_switch.swift

Lines changed: 0 additions & 160 deletions
Original file line numberDiff line numberDiff line change
@@ -420,166 +420,6 @@ func checkDiagnosticMinimality(x: Runcible?) {
420420
}
421421
}
422422

423-
enum LargeSpaceEnum {
424-
case case0
425-
case case1
426-
case case2
427-
case case3
428-
case case4
429-
case case5
430-
case case6
431-
case case7
432-
case case8
433-
case case9
434-
case case10
435-
}
436-
437-
func notQuiteBigEnough() -> Bool {
438-
switch (LargeSpaceEnum.case1, LargeSpaceEnum.case2) { // expected-error {{switch must be exhaustive}}
439-
// expected-note@-1 110 {{add missing case:}}
440-
case (.case0, .case0): return true
441-
case (.case1, .case1): return true
442-
case (.case2, .case2): return true
443-
case (.case3, .case3): return true
444-
case (.case4, .case4): return true
445-
case (.case5, .case5): return true
446-
case (.case6, .case6): return true
447-
case (.case7, .case7): return true
448-
case (.case8, .case8): return true
449-
case (.case9, .case9): return true
450-
case (.case10, .case10): return true
451-
}
452-
}
453-
454-
enum OverlyLargeSpaceEnum {
455-
case case0
456-
case case1
457-
case case2
458-
case case3
459-
case case4
460-
case case5
461-
case case6
462-
case case7
463-
case case8
464-
case case9
465-
case case10
466-
case case11
467-
}
468-
469-
enum ContainsOverlyLargeEnum {
470-
case one(OverlyLargeSpaceEnum)
471-
case two(OverlyLargeSpaceEnum)
472-
case three(OverlyLargeSpaceEnum, OverlyLargeSpaceEnum)
473-
}
474-
475-
func quiteBigEnough() -> Bool {
476-
switch (OverlyLargeSpaceEnum.case1, OverlyLargeSpaceEnum.case2) { // expected-error {{the compiler is unable to check that this switch is exhaustive in reasonable time}}
477-
// expected-note@-1 {{do you want to add a default clause?}}
478-
case (.case0, .case0): return true
479-
case (.case1, .case1): return true
480-
case (.case2, .case2): return true
481-
case (.case3, .case3): return true
482-
case (.case4, .case4): return true
483-
case (.case5, .case5): return true
484-
case (.case6, .case6): return true
485-
case (.case7, .case7): return true
486-
case (.case8, .case8): return true
487-
case (.case9, .case9): return true
488-
case (.case10, .case10): return true
489-
case (.case11, .case11): return true
490-
}
491-
492-
// No diagnostic
493-
switch (OverlyLargeSpaceEnum.case1, OverlyLargeSpaceEnum.case2) {
494-
case (.case0, _): return true
495-
case (.case1, _): return true
496-
case (.case2, _): return true
497-
case (.case3, _): return true
498-
case (.case4, _): return true
499-
case (.case5, _): return true
500-
case (.case6, _): return true
501-
case (.case7, _): return true
502-
case (.case8, _): return true
503-
case (.case9, _): return true
504-
case (.case10, _): return true
505-
case (.case11, _): return true
506-
}
507-
508-
switch (OverlyLargeSpaceEnum.case1, OverlyLargeSpaceEnum.case2) { // expected-error {{the compiler is unable to check that this switch is exhaustive in reasonable time}}
509-
case (.case0, .case0): return true
510-
case (.case1, .case1): return true
511-
case (.case2, .case2): return true
512-
case (.case3, .case3): return true
513-
case (.case4, .case4): return true
514-
case (.case5, .case5): return true
515-
case (.case6, .case6): return true
516-
case (.case7, .case7): return true
517-
case (.case8, .case8): return true
518-
case (.case9, .case9): return true
519-
case (.case10, .case10): return true
520-
case (.case11, .case11): return true
521-
@unknown default: return false // expected-note {{remove '@unknown' to handle remaining values}} {{3-12=}}
522-
}
523-
524-
525-
// No diagnostic
526-
switch (OverlyLargeSpaceEnum.case1, OverlyLargeSpaceEnum.case2) {
527-
case (.case0, _): return true
528-
case (.case1, _): return true
529-
case (.case2, _): return true
530-
case (.case3, _): return true
531-
case (.case4, _): return true
532-
case (.case5, _): return true
533-
case (.case6, _): return true
534-
case (.case7, _): return true
535-
case (.case8, _): return true
536-
case (.case9, _): return true
537-
case (.case10, _): return true
538-
case (.case11, _): return true
539-
}
540-
541-
// No diagnostic
542-
switch (OverlyLargeSpaceEnum.case1, OverlyLargeSpaceEnum.case2) {
543-
case (_, .case0): return true
544-
case (_, .case1): return true
545-
case (_, .case2): return true
546-
case (_, .case3): return true
547-
case (_, .case4): return true
548-
case (_, .case5): return true
549-
case (_, .case6): return true
550-
case (_, .case7): return true
551-
case (_, .case8): return true
552-
case (_, .case9): return true
553-
case (_, .case10): return true
554-
case (_, .case11): return true
555-
}
556-
557-
// No diagnostic
558-
switch (OverlyLargeSpaceEnum.case1, OverlyLargeSpaceEnum.case2) {
559-
case (_, _): return true
560-
}
561-
562-
// No diagnostic
563-
switch (OverlyLargeSpaceEnum.case1, OverlyLargeSpaceEnum.case2) {
564-
case (.case0, .case0): return true
565-
case (.case1, .case1): return true
566-
case (.case2, .case2): return true
567-
case (.case3, .case3): return true
568-
case _: return true
569-
}
570-
571-
// No diagnostic
572-
switch ContainsOverlyLargeEnum.one(.case0) {
573-
case .one: return true
574-
case .two: return true
575-
case .three: return true
576-
}
577-
578-
// Make sure we haven't just stopped emitting diagnostics.
579-
switch OverlyLargeSpaceEnum.case1 { // expected-error {{switch must be exhaustive}} expected-note 16 {{add missing case}} expected-note {{handle unknown values}}
580-
}
581-
}
582-
583423
indirect enum InfinitelySized {
584424
case one
585425
case two

0 commit comments

Comments
 (0)