SwiftShims: restrict AArch64 workaround to C++

compnerd · compnerd · commit 13c139113804 · 2019-07-14T14:01:40.000-07:00
`RefCount.h` can be included in a C context - e.g. building the
SwiftShims module.  Restrict the C++ overloads to the C++ context only.
This partially improves the build for Windows ARM64.
diff --git a/stdlib/public/SwiftShims/RefCount.h b/stdlib/public/SwiftShims/RefCount.h
@@ -1496,6 +1496,7 @@ _Static_assert(_Alignof(InlineRefCounts) == _Alignof(__swift_uintptr_t),
 #endif
 
 #if defined(_WIN32) && defined(_M_ARM64)
+#if defined(__cplusplus)
 namespace std {
 template <>
 inline void _Atomic_storage<swift::SideTableRefCountBits, 16>::_Unlock() const noexcept {
@@ -1505,5 +1506,6 @@ inline void _Atomic_storage<swift::SideTableRefCountBits, 16>::_Unlock() const n
 }
 }
 #endif
+#endif
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -1496,6 +1496,7 @@ _Static_assert(_Alignof(InlineRefCounts) == _Alignof(__swift_uintptr_t),`
`1496`	`1496`	`#endif`
`1497`	`1497`
`1498`	`1498`	`#if defined(_WIN32) && defined(_M_ARM64)`
	`1499`	`+#if defined(__cplusplus)`
`1499`	`1500`	`namespace std {`
`1500`	`1501`	`template <>`
`1501`	`1502`	`inline void _Atomic_storage<swift::SideTableRefCountBits, 16>::_Unlock() const noexcept {`
`@@ -1505,5 +1506,6 @@ inline void _Atomic_storage<swift::SideTableRefCountBits, 16>::_Unlock() const n`
`1505`	`1506`	`}`
`1506`	`1507`	`}`
`1507`	`1508`	`#endif`
	`1509`	`+#endif`
`1508`	`1510`
`1509`	`1511`	`#endif`