Skip to content

Commit 624c559

Browse files
authored
Merge pull request #62233 from eeckstein/fix-tests
Fix and temporarily disable tests for rebranch
2 parents f88d7eb + 81cdbfa commit 624c559

11 files changed

+22
-7
lines changed

test/AutoDiff/compiler_crashers_fixed/issue-58123-invalid-debug-info.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// conflicting debug variable type
66

77
// CHECK-LABEL: define internal swiftcc float @"$s4main8TestTypeV24doDifferentiableTimeStep04timeG0ySf_tFTJpSSpSrTA"
8-
// CHECK: [[SELF:%.*]] = alloca %T4main8TestTypeV06ManualB7TangentV, align 4
8+
// CHECK: [[SELF:%.*]] = alloca %T4main8TestTypeV06ManualB7TangentV
99
// CHECK: call void @llvm.dbg.declare(metadata %T4main8TestTypeV06ManualB7TangentV* [[SELF]]
1010

1111
import _Differentiation

test/DebugInfo/async-args.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
// RUN: -parse-as-library | %FileCheck %s
44
// REQUIRES: concurrency
55

6+
// REQUIRES: rdar102151684
7+
68
func use<T>(_ t: T) {}
79
func forceSplit() async {
810
}

test/DebugInfo/async-lifetime-extension.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
// RUN: | %FileCheck %s --check-prefix=CHECK
44
// REQUIRES: concurrency
55

6+
// REQUIRES: rdar102151684
7+
68
// Test that lifetime extension preserves a dbg.declare for "n" in the resume
79
// funclet.
810

test/DebugInfo/line-directive.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// REQUIRES: rdar102151684
2+
13
func markUsed<T>(_ t: T) {}
24
func f() {
35
if 1==1 {

test/IDE/print_clang_header.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
// FIXME: rdar://problem/19648117 Needs splitting objc parts out
22
// REQUIRES: objc_interop
33

4+
// REQUIRES: rdar102151774
5+
46
// RUN: echo '#include "header-to-print.h"' > %t.m
57
// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -source-filename %s -print-header -header-to-print %S/Inputs/print_clang_header/header-to-print.h -print-regular-comments -enable-objc-interop -disable-objc-attr-requires-foundation-module --cc-args %target-cc-options -isysroot %clang-importer-sdk-path -fsyntax-only %t.m -I %S/Inputs/print_clang_header > %t.txt
68
// RUN: diff -u %S/Inputs/print_clang_header/header-to-print.h.printed.txt %t.txt

test/IRGen/generic_classes.sil

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// RUN: %target-swift-frontend %t/generic_classes.sil -emit-ir -disable-objc-interop | %FileCheck %t/generic_classes.sil --check-prefixes=CHECK,CHECK-native,CHECK-%target-import-type
55
// RUN: %target-swift-frontend -Osize %t/generic_classes.sil -emit-ir | %FileCheck %t/generic_classes.sil --check-prefix=OSIZE
66

7-
// REQUIRES: CPU=x86_64
7+
// REQUIRES: PTRSIZE=64
88

99
import Builtin
1010
import Swift
@@ -54,7 +54,7 @@ import Swift
5454
// -- ivar destroyer
5555
// CHECK-SAME: i32 0,
5656
// -- flags
57-
// CHECK_SAME: i32 3,
57+
// CHECK-SAME: i32 2,
5858
// -- immediate pattern size
5959
// CHECK-native-SAME: i16 0,
6060
// CHECK-objc-SAME: i16 5,
@@ -133,7 +133,7 @@ import Swift
133133
// -- ivar destroyer
134134
// CHECK-SAME: i32 0,
135135
// -- class flags
136-
// CHECK_SAME: i32 3,
136+
// CHECK-SAME: i32 2,
137137
// -- extra data pattern offset
138138
// CHECK-objc-SAME: i16 5,
139139
// -- extra data pattern size

test/IRGen/objc_subclass.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -261,10 +261,10 @@
261261
// CHECK-64: ] }
262262

263263

264-
// CHECK: @"objc_classes_$s13objc_subclass10SwiftGizmoCN" = internal global i8* bitcast (%swift.type* @"$s13objc_subclass10SwiftGizmoCN" to i8*), section "__DATA,__objc_classlist,regular,no_dead_strip", align [[WORD_SIZE_IN_BYTES]]
265-
// CHECK: @"objc_classes_$s13objc_subclass11SwiftGizmo2CN" = internal global i8* bitcast (%swift.type* @"$s13objc_subclass11SwiftGizmo2CN" to i8*), section "__DATA,__objc_classlist,regular,no_dead_strip", align [[WORD_SIZE_IN_BYTES]]
264+
// CHECK: @"objc_classes_$s13objc_subclass10SwiftGizmoCN" = internal global i8* bitcast (%swift.type* @"$s13objc_subclass10SwiftGizmoCN" to i8*), section "__DATA,__objc_classlist,regular,no_dead_strip", no_sanitize_address, align [[WORD_SIZE_IN_BYTES]]
265+
// CHECK: @"objc_classes_$s13objc_subclass11SwiftGizmo2CN" = internal global i8* bitcast (%swift.type* @"$s13objc_subclass11SwiftGizmo2CN" to i8*), section "__DATA,__objc_classlist,regular,no_dead_strip", no_sanitize_address, align [[WORD_SIZE_IN_BYTES]]
266266

267-
// CHECK: @objc_non_lazy_classes = internal global [1 x i8*] [i8* bitcast (%swift.type* @"$s13objc_subclass11SwiftGizmo2CN" to i8*)], section "__DATA,__objc_nlclslist,regular,no_dead_strip", align [[WORD_SIZE_IN_BYTES]]
267+
// CHECK: @objc_non_lazy_classes = internal global [1 x i8*] [i8* bitcast (%swift.type* @"$s13objc_subclass11SwiftGizmo2CN" to i8*)], section "__DATA,__objc_nlclslist,regular,no_dead_strip", no_sanitize_address, align [[WORD_SIZE_IN_BYTES]]
268268

269269
import Foundation
270270
import gizmo

test/Interop/Cxx/enum/c-enums-NS_OPTIONS-api-notes-renamed-options.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
// REQUIRES: objc_interop
55

6+
// REQUIRES: rdar102858524
7+
68
import CenumsNSOptions
79

810
// CHECK-NOT: warning: imported declaration 'API_NOTES_NAMED_OptionOne' could not be mapped to 'SwiftOptionOneApiNotes'

test/Interop/Cxx/enum/c-enums-NS_OPTIONS-swift-named-options.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
// REQUIRES: objc_interop
55

6+
// REQUIRES: rdar102858524
7+
68
import CenumsNSOptions
79

810
// CHECK-NOT: warning: imported declaration 'NS_SWIFT_NAMED_OptionOne' could not be mapped to 'SwiftOptionOne'

test/PrintAsObjC/availability-real-sdk.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
// CHECK-NEXT: - (nullable instancetype)initWithCoder:(NSCoder * _Nonnull){{[a-zA-Z]+}} OBJC_DESIGNATED_INITIALIZER;
5050
// CHECK-NEXT: @end
5151

52+
// REQUIRES: rdar102629628
5253

5354
import Foundation
5455

test/PrintAsObjC/override.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515

1616
// REQUIRES: objc_interop
1717

18+
// REQUIRES: rdar102629628
19+
1820
import OverrideBase
1921
// No errors from Clang until we get to the FixMe class.
2022
// CLANG-NOT: error

0 commit comments

Comments
 (0)