Skip to content

Commit ed78ae6

Browse files
authored
Merge pull request #76017 from tshortli/dispatch-shims-warning
Runtime: Fix `-Wmissing-field-initializers` warnings in DispatchShims.h
2 parents 694c202 + 3c204cc commit ed78ae6

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

include/swift/Runtime/DispatchShims.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@ swift_dispatch_thread_get_current_override_qos_floor()
3131
return dispatch_thread_get_current_override_qos_floor();
3232
}
3333

34-
return (dispatch_thread_override_info_s) {0};
34+
return (dispatch_thread_override_info_s){
35+
0, // can_override
36+
0, // unused
37+
QOS_CLASS_UNSPECIFIED, // override_qos_floor
38+
};
3539
}
3640

3741
static inline int

test/IRGen/objc.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,6 @@ class WeakObjC {
140140
// CHECK: i32 1, !"Objective-C Image Info Version", i32 0}
141141
// CHECK: i32 1, !"Objective-C Image Info Section", !"__DATA,__objc_imageinfo,regular,no_dead_strip"}
142142
// 100730624 == (6 << 24) | (1 << 16) | (7 << 8).
143-
// 5 and 8 is the current major.minor version. 7 is the Swift ABI version.
143+
// 6 and 1 is the current major.minor version. 7 is the Swift ABI version.
144144
// CHECK: i32 4, !"Objective-C Garbage Collection", i32 100730624}
145145
// CHECK: i32 1, !"Swift Version", i32 7}

0 commit comments

Comments
 (0)