quote all the arguments to the clang-macro macros

Author: QuietMisdreavus

include/swift/PrintAsClang/ClangMacros.def

@@ -72,60 +72,54 @@
 #define CLANG_MACRO_CXX_BODY(NAME, BODY)
 #endif
 
-CLANG_MACRO_BODY(SWIFT_PASTE, \
+CLANG_MACRO_BODY("SWIFT_PASTE", \
     "# define SWIFT_PASTE_HELPER(x, y) x##y\n" \
     "# define SWIFT_PASTE(x, y) SWIFT_PASTE_HELPER(x, y)")
-CLANG_MACRO_DEFINED(SWIFT_PASTE_HELPER)
-
-CLANG_MACRO(SWIFT_METATYPE, (X), Class)
-
-CLANG_MACRO_CONDITIONAL(SWIFT_CLASS_PROPERTY, \
-                        (...), \
-                        __has_feature(objc_class_property), \
-                        __VA_ARGS__)
-
-CLANG_MACRO_CONDITIONAL(SWIFT_RUNTIME_NAME, \
-                        (X), \
-                        __has_attribute(objc_runtime_name), \
-                        __attribute__((objc_runtime_name(X))))
-
-CLANG_MACRO_CONDITIONAL(SWIFT_COMPILE_NAME, \
-                        (X), \
-                        __has_attribute(swift_name), \
-                        __attribute__((swift_name(X))))
-
-CLANG_MACRO_CONDITIONAL(SWIFT_METHOD_FAMILY, \
-                        (X), \
-                        __has_attribute(objc_method_family),
-                        __attribute__((objc_method_family(X))))
-
-CLANG_MACRO_CONDITIONAL(SWIFT_NOESCAPE, , \
-                        __has_attribute(noescape), \
-                        __attribute__((noescape)))
-
-CLANG_MACRO_CONDITIONAL(SWIFT_RELEASES_ARGUMENT, , \
-                        __has_attribute(ns_consumed), \
-                        __attribute__((ns_consumed)))
-
-CLANG_MACRO_CONDITIONAL(SWIFT_WARN_UNUSED_RESULT, , \
-                        __has_attribute(warn_unused_result), \
-                        __attribute__((warn_unused_result)))
-
-// While this would ordinarily work with CLANG_MACRO_CONDITIONAL, this name is
-// defined in the compiler source itself, and is expanded by the time the macro
-// is printed into the resulting header
-CLANG_MACRO_BODY(SWIFT_NORETURN, \
-    "# if __has_attribute(noreturn)\n" \
-    "#  define SWIFT_NORETURN __attribute((noreturn))\n" \
-    "# else\n" \
-    "#  define SWIFT_NORETURN\n" \
-    "# endif")
+CLANG_MACRO_DEFINED("SWIFT_PASTE_HELPER")
+
+CLANG_MACRO("SWIFT_METATYPE", "(X)", "Class")
+
+CLANG_MACRO_CONDITIONAL("SWIFT_CLASS_PROPERTY", \
+                        "(...)", \
+                        "__has_feature(objc_class_property)", \
+                        "__VA_ARGS__")
+
+CLANG_MACRO_CONDITIONAL("SWIFT_RUNTIME_NAME", \
+                        "(X)", \
+                        "__has_attribute(objc_runtime_name)", \
+                        "__attribute__((objc_runtime_name(X)))")
+
+CLANG_MACRO_CONDITIONAL("SWIFT_COMPILE_NAME", \
+                        "(X)", \
+                        "__has_attribute(swift_name)", \
+                        "__attribute__((swift_name(X)))")
+
+CLANG_MACRO_CONDITIONAL("SWIFT_METHOD_FAMILY", \
+                        "(X)", \
+                        "__has_attribute(objc_method_family)",
+                        "__attribute__((objc_method_family(X)))")
+
+CLANG_MACRO_CONDITIONAL("SWIFT_NOESCAPE", , \
+                        "__has_attribute(noescape)", \
+                        "__attribute__((noescape))")
+
+CLANG_MACRO_CONDITIONAL("SWIFT_RELEASES_ARGUMENT", , \
+                        "__has_attribute(ns_consumed)", \
+                        "__attribute__((ns_consumed))")
+
+CLANG_MACRO_CONDITIONAL("SWIFT_WARN_UNUSED_RESULT", , \
+                        "__has_attribute(warn_unused_result)", \
+                        "__attribute__((warn_unused_result))")
+
+CLANG_MACRO_CONDITIONAL("SWIFT_NORETURN", , \
+                        "__has_attribute(noreturn)", \
+                        "__attribute__((noreturn))")
 
-CLANG_MACRO(SWIFT_CLASS_EXTRA, , )
-CLANG_MACRO(SWIFT_PROTOCOL_EXTRA, , )
-CLANG_MACRO(SWIFT_ENUM_EXTRA, , )
+CLANG_MACRO("SWIFT_CLASS_EXTRA", , )
+CLANG_MACRO("SWIFT_PROTOCOL_EXTRA", , )
+CLANG_MACRO("SWIFT_ENUM_EXTRA", , )
 
-CLANG_MACRO_BODY(SWIFT_CLASS, \
+CLANG_MACRO_BODY("SWIFT_CLASS", \
     "# if __has_attribute(objc_subclassing_restricted)\n" \
     "#  define SWIFT_CLASS(SWIFT_NAME) " \
         "SWIFT_RUNTIME_NAME(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) " \
@@ -139,9 +133,9 @@ CLANG_MACRO_BODY(SWIFT_CLASS, \
     "#  define SWIFT_CLASS_NAMED(SWIFT_NAME) " \
         "SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA\n" \
     "# endif")
-CLANG_MACRO_DEFINED(SWIFT_CLASS_NAMED)
+CLANG_MACRO_DEFINED("SWIFT_CLASS_NAMED")
 
-CLANG_MACRO_BODY(SWIFT_RESILIENT_CLASS, \
+CLANG_MACRO_BODY("SWIFT_RESILIENT_CLASS", \
     "# if __has_attribute(objc_class_stub)\n" \
     "#  define SWIFT_RESILIENT_CLASS(SWIFT_NAME) " \
         "SWIFT_CLASS(SWIFT_NAME) __attribute__((objc_class_stub))\n" \
@@ -151,26 +145,26 @@ CLANG_MACRO_BODY(SWIFT_RESILIENT_CLASS, \
     "#  define SWIFT_RESILIENT_CLASS(SWIFT_NAME) SWIFT_CLASS(SWIFT_NAME)\n" \
     "#  define SWIFT_RESILIENT_CLASS_NAMED(SWIFT_NAME) SWIFT_CLASS_NAMED(SWIFT_NAME)\n" \
     "# endif")
-CLANG_MACRO_DEFINED(SWIFT_RESILIENT_CLASS_NAMED)
+CLANG_MACRO_DEFINED("SWIFT_RESILIENT_CLASS_NAMED")
 
-CLANG_MACRO_BODY(SWIFT_PROTOCOL, \
+CLANG_MACRO_BODY("SWIFT_PROTOCOL", \
     "# define SWIFT_PROTOCOL(SWIFT_NAME) " \
         "SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA\n" \
     "# define SWIFT_PROTOCOL_NAMED(SWIFT_NAME) " \
         "SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA")
-CLANG_MACRO_DEFINED(SWIFT_PROTOCOL_NAMED)
+CLANG_MACRO_DEFINED("SWIFT_PROTOCOL_NAMED")
 
-CLANG_MACRO(SWIFT_EXTENSION, (M), SWIFT_PASTE(M##_Swift_, __LINE__))
+CLANG_MACRO("SWIFT_EXTENSION", "(M)", "SWIFT_PASTE(M##_Swift_, __LINE__)")
 
-CLANG_MACRO_CONDITIONAL(OBJC_DESIGNATED_INITIALIZER, , \
-                        __has_attribute(objc_designated_initializer), \
-                        __attribute__((objc_designated_initializer)))
+CLANG_MACRO_CONDITIONAL("OBJC_DESIGNATED_INITIALIZER", , \
+                        "__has_attribute(objc_designated_initializer)", \
+                        "__attribute__((objc_designated_initializer))")
 
-CLANG_MACRO_CONDITIONAL(SWIFT_ENUM_ATTR, (_extensibility), \
-                        __has_attribute(enum_extensibility), \
-                        __attribute__((enum_extensibility(_extensibility))))
+CLANG_MACRO_CONDITIONAL("SWIFT_ENUM_ATTR", "(_extensibility)", \
+                        "__has_attribute(enum_extensibility)", \
+                        "__attribute__((enum_extensibility(_extensibility)))")
 
-CLANG_MACRO_BODY(SWIFT_ENUM, \
+CLANG_MACRO_BODY("SWIFT_ENUM", \
     "# define SWIFT_ENUM(_type, _name, _extensibility) " \
         "enum _name : _type _name; " \
         "enum SWIFT_ENUM_ATTR(_extensibility) SWIFT_ENUM_EXTRA _name: _type\n" \
@@ -184,41 +178,39 @@ CLANG_MACRO_BODY(SWIFT_ENUM, \
         "SWIFT_ENUM(_type, _name, _extensibility)\n" \
     "# endif")
 
-CLANG_MACRO(SWIFT_UNAVAILABLE, , __attribute__((unavailable)))
-CLANG_MACRO(SWIFT_UNAVAILABLE_MSG, (msg), __attribute__((unavailable(msg))))
+CLANG_MACRO("SWIFT_UNAVAILABLE", , "__attribute__((unavailable))")
+CLANG_MACRO("SWIFT_UNAVAILABLE_MSG", "(msg)", "__attribute__((unavailable(msg)))")
 
-CLANG_MACRO(SWIFT_AVAILABILITY, (plat, ...), __attribute__((availability(plat, __VA_ARGS__))))
+CLANG_MACRO("SWIFT_AVAILABILITY", "(plat, ...)", "__attribute__((availability(plat, __VA_ARGS__)))")
 
-// SWIFT_WEAK_IMPORT is also defined within the compiler source, so use CLANG_MACRO_BODY to avoid
-// being expanded before being emitted into the header
-CLANG_MACRO_BODY(SWIFT_WEAK_IMPORT, "# define SWIFT_WEAK_IMPORT __attribute__((weak_import))")
+CLANG_MACRO("SWIFT_WEAK_IMPORT", , "__attribute__((weak_import))")
 
-CLANG_MACRO(SWIFT_DEPRECATED, , __attribute__((deprecated)))
-CLANG_MACRO(SWIFT_DEPRECATED_MSG, (...), __attribute__((deprecated(__VA_ARGS__))))
+CLANG_MACRO("SWIFT_DEPRECATED", , "__attribute__((deprecated))")
+CLANG_MACRO("SWIFT_DEPRECATED_MSG", "(...)", "__attribute__((deprecated(__VA_ARGS__)))")
 
-CLANG_MACRO_ALTERNATIVE(SWIFT_DEPRECATED_OBJC, (Msg), \
-                        __has_feature(attribute_diagnost_if_objc), \
-                        __attribute__((diagnose_if(1, Msg, "warning"))), \
-                        SWIFT_DEPRECATED_MSG(Msg))
+CLANG_MACRO_ALTERNATIVE("SWIFT_DEPRECATED_OBJC", "(Msg)", \
+                        "__has_feature(attribute_diagnost_if_objc)", \
+                        "__attribute__((diagnose_if(1, Msg, \"warning\")))", \
+                        "SWIFT_DEPRECATED_MSG(Msg)")
 
-CLANG_MACRO_OBJC(IBSegueAction, , )
+CLANG_MACRO_OBJC("IBSegueAction", , )
 
-CLANG_MACRO_BODY(SWIFT_EXTERN, \
+CLANG_MACRO_BODY("SWIFT_EXTERN", \
     "# if defined(__cplusplus)\n" \
     "#  define SWIFT_EXTERN extern \"C\"\n" \
     "# else\n" \
     "#  define SWIFT_EXTERN extern\n"
     "# endif")
 
-CLANG_MACRO(SWIFT_CALL, , __attribute__((swiftcall)))
+CLANG_MACRO("SWIFT_CALL", , "__attribute__((swiftcall))")
 
-CLANG_MACRO(SWIFT_INDIRECT_RESULT, , __attribute__((swift_indirect_result)))
+CLANG_MACRO("SWIFT_INDIRECT_RESULT", , "__attribute__((swift_indirect_result))")
 
-CLANG_MACRO(SWIFT_CONTEXT, , __attribute__((swift_context)))
+CLANG_MACRO("SWIFT_CONTEXT", , "__attribute__((swift_context))")
 
-CLANG_MACRO_CXX(SWIFT_NOEXCEPT, , noexcept, )
+CLANG_MACRO_CXX("SWIFT_NOEXCEPT", , "noexcept", )
 
-CLANG_MACRO_CXX_BODY(SWIFT_CXX_INT_DEFINED, \
+CLANG_MACRO_CXX_BODY("SWIFT_CXX_INT_DEFINED", \
     "#if !defined(SWIFT_CXX_INT_DEFINED)\n" \
     "#define SWIFT_CXX_INT_DEFINED\n" \
     "namespace swift {\n" \

lib/PrintAsClang/PrintAsClang.cpp

@@ -134,31 +134,31 @@ static void writePrologue(raw_ostream &out, ASTContext &ctx,
          "\n";
 
 #define CLANG_MACRO_BODY(NAME, BODY) \
-  out << "#if !defined(" #NAME ")\n" \
+  out << "#if !defined(" NAME ")\n" \
          BODY "\n" \
          "#endif\n";
 
-#define CLANG_MACRO(NAME, ARGS, VALUE) CLANG_MACRO_BODY(NAME, "# define " #NAME #ARGS " " #VALUE)
+#define CLANG_MACRO(NAME, ARGS, VALUE) CLANG_MACRO_BODY(NAME, "# define " NAME ARGS " " VALUE)
 
 #define CLANG_MACRO_ALTERNATIVE(NAME, ARGS, CONDITION, VALUE, ALTERNATIVE) CLANG_MACRO_BODY(NAME, \
-  "# if " #CONDITION "\n" \
-  "#  define " #NAME #ARGS " " #VALUE "\n" \
+  "# if " CONDITION "\n" \
+  "#  define " NAME ARGS " " VALUE "\n" \
   "# else\n" \
-  "#  define " #NAME #ARGS " " #ALTERNATIVE "\n" \
+  "#  define " NAME ARGS " " ALTERNATIVE "\n" \
   "# endif")
 
 #define CLANG_MACRO_OBJC(NAME, ARGS, VALUE) \
   out << "#if defined(__OBJC__)\n" \
-         "#if !defined(" #NAME ")\n" \
-         "# define " #NAME #ARGS " " #VALUE "\n" \
+         "#if !defined(" NAME ")\n" \
+         "# define " NAME ARGS " " VALUE "\n" \
          "#endif\n" \
          "#endif\n";
 
 #define CLANG_MACRO_CXX(NAME, ARGS, VALUE, ALTERNATIVE) \
   out << "#if defined(__cplusplus)\n" \
-         "# define " #NAME #ARGS " " #VALUE "\n" \
+         "# define " NAME ARGS " " VALUE "\n" \
          "#else\n" \
-         "# define " #NAME #ARGS " " #ALTERNATIVE "\n" \
+         "# define " NAME ARGS " " ALTERNATIVE "\n" \
          "#endif\n";
 
 #define CLANG_MACRO_CXX_BODY(NAME, BODY) \

tools/swift-compatibility-symbols/swift-compatibility-symbols.cpp

@@ -53,7 +53,7 @@ int main(int argc, char *argv[]) {
 
   llvm::SmallVector<llvm::StringRef, 40> symbols;
 #define CLANG_MACRO_DEFINED(NAME) \
-  symbols.push_back(#NAME);
+  symbols.push_back(NAME);
 
 #define CLANG_MACRO(NAME, ARGS, VALUE) \
   CLANG_MACRO_DEFINED(NAME)