Merge pull request apple#9 from lorentey/fix-implicit-runtime-dependency

[shims] Make retain_n/release_n shims header-only
lorentey · Oct 7, 2020 · c6e526a · c6e526a
2 parents c6b1ed7 + 40bd3ba
commit c6e526a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/Package.swift b/Package.swift
@@ -24,8 +24,7 @@ let package = Package(
     .target(name: "_AtomicsShims"),
     .target(
       name: "Atomics",
-      dependencies: ["_AtomicsShims"],
-      path: "Sources/Atomics"
+      dependencies: ["_AtomicsShims"]
     ),
     .testTarget(
       name: "AtomicsTests",

diff --git a/Sources/_AtomicsShims/include/_AtomicsShims.h b/Sources/_AtomicsShims/include/_AtomicsShims.h
@@ -360,7 +360,16 @@ SWIFTATOMIC_DEFINE_TYPE(COMPLEX, DoubleWord, _sa_dword, uint64_t)
 #error "Unsupported intptr_t bit width"
 #endif // __INTPTR_WIDTH
 
-extern void _sa_retain_n(void *object, uint32_t n);
-extern void _sa_release_n(void *object, uint32_t n);
+SWIFTATOMIC_INLINE
+void _sa_retain_n(void *object, uint32_t n) {
+  extern void *swift_retain_n(void *object, uint32_t n);
+  swift_retain_n(object, n);
+}
+
+SWIFTATOMIC_INLINE
+void _sa_release_n(void *object, uint32_t n) {
+  extern void swift_release_n(void *object, uint32_t n);
+  swift_release_n(object, n);
+}
 
 #endif //SWIFTATOMIC_HEADER_INCLUDED
diff --git a/Sources/_AtomicsShims/src/_AtomicsShims.c b/Sources/_AtomicsShims/src/_AtomicsShims.c
@@ -12,12 +12,6 @@
 
 #include "_AtomicsShims.h"
 
-void _sa_retain_n(void *object, uint32_t n) {
-  extern void *swift_retain_n(void *object, uint32_t n);
-  swift_retain_n(object, n);
-}
-
-void _sa_release_n(void *object, uint32_t n) {
-  extern void swift_release_n(void *object, uint32_t n);
-  swift_release_n(object, n);
-}
+// Note: This file intentionally doesn't contain any actual defintions;
+// it only exists to satisfy SPM's requirement that each C target include at
+// least one .c file.