Merge pull request swiftlang#39633 from ahoppen/pr/fix-warnings

Fix a couple of build warnings

Author: ahoppen

include/swift/Demangling/ManglingMacros.h

@@ -17,7 +17,10 @@
 #define MANGLE_AS_STRING(M) STRINGIFY_MANGLING(M)
 
 /// The mangling prefix for the new mangling.
+_Pragma("clang diagnostic push")
+_Pragma("clang diagnostic ignored \"-Wdollar-in-identifier-extension\"")
 #define MANGLING_PREFIX $s
+_Pragma("clang diagnostic pop")
 
 #define MANGLING_PREFIX_STR MANGLE_AS_STRING(MANGLING_PREFIX)
 

include/swift/SIL/BridgedSwiftObject.h

@@ -20,12 +20,30 @@
 
 #include <stdint.h>
 
-#if !__has_feature(nullability)
+// TODO: These macro definitions are duplicated in Visibility.h. Move
+// them to a single file if we find a location that both Visibility.h and
+// BridgedSwiftObject.h can import.
+#if __has_feature(nullability)
+// Provide macros to temporarily suppress warning about the use of
+// _Nullable and _Nonnull.
+# define SWIFT_BEGIN_NULLABILITY_ANNOTATIONS                                   \
+  _Pragma("clang diagnostic push")                                             \
+  _Pragma("clang diagnostic ignored \"-Wnullability-extension\"")
+# define SWIFT_END_NULLABILITY_ANNOTATIONS                                     \
+  _Pragma("clang diagnostic pop")
+
+#else
+// #define _Nullable and _Nonnull to nothing if we're not being built
+// with a compiler that supports them.
 # define _Nullable
 # define _Nonnull
 # define _Null_unspecified
+# define SWIFT_BEGIN_NULLABILITY_ANNOTATIONS
+# define SWIFT_END_NULLABILITY_ANNOTATIONS
 #endif
 
+SWIFT_BEGIN_NULLABILITY_ANNOTATIONS
+
 typedef const void * _Nonnull SwiftMetatype;
 
 /// The header of a Swift object.
@@ -40,4 +58,6 @@ struct BridgedSwiftObject {
 typedef struct BridgedSwiftObject * _Nonnull SwiftObject;
 typedef struct BridgedSwiftObject * _Nullable OptionalSwiftObject;
 
+SWIFT_END_NULLABILITY_ANNOTATIONS
+
 #endif

include/swift/SIL/SILBridging.h

@@ -17,6 +17,8 @@
 #include <stddef.h>
 #include <string>
 
+SWIFT_BEGIN_NULLABILITY_ANNOTATIONS
+
 typedef struct {
   const unsigned char * _Nullable data;
   size_t length;
@@ -235,4 +237,6 @@ BridgedInstruction SILBuilder_createBuiltinBinaryFunction(
 BridgedInstruction SILBuilder_createCondFail(BridgedInstruction insertionPoint,
           BridgedLocation loc, BridgedValue condition, BridgedStringRef messge);
 
+SWIFT_END_NULLABILITY_ANNOTATIONS
+
 #endif

include/swift/SILOptimizer/OptimizerBridging.h

@@ -15,6 +15,8 @@
 
 #include "../SIL/SILBridging.h"
 
+SWIFT_BEGIN_NULLABILITY_ANNOTATIONS
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -72,4 +74,6 @@ BridgedFunction BridgedFunctionArray_get(BridgedCalleeList callees,
 } // extern "C"
 #endif
 
+SWIFT_END_NULLABILITY_ANNOTATIONS
+
 #endif

lib/SILOptimizer/Utils/OnonePrespecializations.def

@@ -1,3 +1,5 @@
+_Pragma("clang diagnostic push")
+_Pragma("clang diagnostic ignored \"-Wdollar-in-identifier-extension\"")
 PRESPEC_SYMBOL($sS2ayxGycfCSJ_Tg5)
 PRESPEC_SYMBOL($sS2ayxGycfCSS_Tg5)
 PRESPEC_SYMBOL($sS2ayxGycfCSd_Tg5)
@@ -1196,3 +1198,4 @@ PRESPEC_SYMBOL($ss22_ContiguousArrayBufferVAByxGycfCs6UInt64V_Tg5)
 PRESPEC_SYMBOL($ss22_ContiguousArrayBufferVAByxGycfCs7UnicodeO6ScalarV_Tg5)
 PRESPEC_SYMBOL($ss27_allocateUninitializedArrayySayxG_BptBwlFyp_Tg5)
 
+_Pragma("clang diagnostic pop")

stdlib/public/SwiftShims/Visibility.h

@@ -34,6 +34,9 @@
 #define __has_cpp_attribute(attribute) 0
 #endif
 
+// TODO: These macro definitions are duplicated in BridgedSwiftObject.h. Move
+// them to a single file if we find a location that both Visibility.h and
+// BridgedSwiftObject.h can import.
 #if __has_feature(nullability)
 // Provide macros to temporarily suppress warning about the use of
 // _Nullable and _Nonnull.
@@ -219,7 +222,7 @@
 #define SWIFT_FALLTHROUGH
 #endif
 
-#if __cplusplus >= 201402l && __has_cpp_attribute(nodiscard)
+#if __cplusplus > 201402l && __has_cpp_attribute(nodiscard)
 #define SWIFT_NODISCARD [[nodiscard]]
 #elif __has_cpp_attribute(clang::warn_unused_result)
 #define SWIFT_NODISCARD [[clang::warn_unused_result]]