Merge pull request #84381 from xymus/rename-cdecl-to-c

Parser: Rename the experimental attribute `@cdecl` to the shorter `@c`

Author: xymus

include/swift/AST/Decl.h

@@ -4903,12 +4903,12 @@ class EnumDecl final : public NominalTypeDecl {
     return getAttrs().hasAttribute<IndirectAttr>();
   }
 
-  /// True if the enum is marked with `@cdecl`.
+  /// True if the enum is marked with `@c`.
   bool isCDeclEnum() const {
     return getAttrs().hasAttribute<CDeclAttr>();
   }
 
-  /// True if the enum is marked with `@cdecl` or `@objc`.
+  /// True if the enum is marked with `@c` or `@objc`.
   bool isCCompatibleEnum() const {
     return isCDeclEnum() || isObjC();
   }
@@ -8236,8 +8236,8 @@ class AbstractFunctionDecl : public GenericContext, public ValueDecl {
   /// instance method.
   bool isObjCInstanceMethod() const;
 
-  /// Get the foreign language targeted by a @cdecl-style attribute, if any.
-  /// Used to abstract away the change in meaning of @cdecl vs @_cdecl while
+  /// Get the foreign language targeted by a @c-style attribute, if any.
+  /// Used to abstract away the change in meaning of @c vs @_cdecl while
   /// formalizing the attribute.
   std::optional<ForeignLanguage> getCDeclKind() const;
 

include/swift/AST/DeclAttr.def

@@ -368,11 +368,11 @@ SIMPLE_DECL_ATTR(_show_in_interface, ShowInInterface,
   UserInaccessible | ABIStableToAdd | ABIStableToRemove | APIStableToAdd | APIStableToRemove | UnreachableInABIAttr,
   62)
 
-DECL_ATTR(_cdecl, CDecl,
+DECL_ATTR(c, CDecl,
   OnFunc | OnAccessor | OnEnum,
   LongAttribute | UserInaccessible | ABIStableToAdd | ABIStableToRemove | APIStableToAdd | APIStableToRemove | ForbiddenInABIAttr,
   63)
-DECL_ATTR_ALIAS(cdecl, CDecl)
+DECL_ATTR_ALIAS(_cdecl, CDecl)
 
 SIMPLE_DECL_ATTR(usableFromInline, UsableFromInline,
   OnAbstractFunction | OnVar | OnSubscript | OnNominalType | OnTypeAlias,

include/swift/AST/DiagnosticsSema.def

@@ -2089,10 +2089,10 @@ ERROR(cdecl_empty_name,none,
 ERROR(cdecl_throws,none,
       "raising errors from %0 functions is not supported", (DeclAttribute))
 ERROR(cdecl_incompatible_with_objc,none,
-      "cannot apply both '@cdecl' and '@objc' to %kindonly0",
+      "cannot apply both '@c' and '@objc' to %kindonly0",
       (const Decl *))
 ERROR(cdecl_feature_required,none,
-      "'@cdecl' requires '-enable-experimental-feature CDecl'",
+      "'@c' requires '-enable-experimental-feature CDecl'",
       ())
 
 // @_used and @_section
@@ -6620,7 +6620,7 @@ ERROR(objc_cannot_infer_name_raw_identifier,none,
       (const ValueDecl *))
 
 // If you change this, also change enum ObjCReason
-#define OBJC_ATTR_SELECT "select{marked '@cdecl'|marked '@_cdecl'|marked dynamic|marked '@objc'|marked '@objcMembers'|marked '@IBOutlet'|marked '@IBAction'|marked '@IBSegueAction'|marked '@NSManaged'|a member of an '@objc' protocol|implicitly '@objc'|an '@objc' override|an implementation of an '@objc' requirement|marked '@IBInspectable'|marked '@GKInspectable'|in an '@objc' extension of a class (without '@nonobjc')|in an '@objc @implementation' extension of a class (without final or '@nonobjc')|marked '@objc' by an access note}"
+#define OBJC_ATTR_SELECT "select{marked '@c'|marked '@_cdecl'|marked dynamic|marked '@objc'|marked '@objcMembers'|marked '@IBOutlet'|marked '@IBAction'|marked '@IBSegueAction'|marked '@NSManaged'|a member of an '@objc' protocol|implicitly '@objc'|an '@objc' override|an implementation of an '@objc' requirement|marked '@IBInspectable'|marked '@GKInspectable'|in an '@objc' extension of a class (without '@nonobjc')|in an '@objc @implementation' extension of a class (without final or '@nonobjc')|marked '@objc' by an access note}"
 
 ERROR(objc_invalid_on_var,none,
       "property cannot be %" OBJC_ATTR_SELECT "0 "
@@ -6674,7 +6674,7 @@ NOTE(not_objc_swift_struct,none,
 NOTE(not_objc_swift_enum,none,
       "non-'@objc' enums cannot be represented in Objective-C", ())
 NOTE(not_cdecl_or_objc_swift_enum,none,
-     "Swift enums not marked '@cdecl'%select{| or '@objc'}0 cannot be "
+     "Swift enums not marked '@c'%select{| or '@objc'}0 cannot be "
      "represented in %" FOREIGN_LANG_SELECT "0",
      (ForeignLanguage))
 NOTE(not_objc_generic_type_param,none,

include/swift/AST/TypeCheckRequests.h

@@ -4948,7 +4948,7 @@ class TypeCheckObjCImplementationRequest
   bool isCached() const { return true; }
 };
 
-/// Check @cdecl functions for compatibility with the foreign language.
+/// Check @c functions for compatibility with the foreign language.
 class TypeCheckCDeclFunctionRequest
     : public SimpleRequest<TypeCheckCDeclFunctionRequest,
                            evaluator::SideEffect(FuncDecl *FD,
@@ -4967,7 +4967,7 @@ class TypeCheckCDeclFunctionRequest
   bool isCached() const { return true; }
 };
 
-/// Check @cdecl enums for compatibility with C.
+/// Check @c enums for compatibility with C.
 class TypeCheckCDeclEnumRequest
     : public SimpleRequest<TypeCheckCDeclEnumRequest,
                            evaluator::SideEffect(EnumDecl *ED,

include/swift/Basic/Features.def

@@ -529,7 +529,7 @@ EXPERIMENTAL_FEATURE(ClosureBodyMacro, true)
 /// Allow declarations of Swift runtime symbols using @_silgen_name.
 EXPERIMENTAL_FEATURE(AllowRuntimeSymbolDeclarations, true)
 
-/// Allow use of `@cdecl`
+/// Allow use of `@c`
 EXPERIMENTAL_FEATURE(CDecl, false)
 
 /// Allow use of `Module::name` syntax

lib/AST/Attr.cpp

@@ -1246,9 +1246,17 @@ bool DeclAttribute::printImpl(ASTPrinter &Printer, const PrintOptions &Options,
     break;
   }
 
-  case DeclAttrKind::CDecl:
-    Printer << "@_cdecl(\"" << cast<CDeclAttr>(this)->Name << "\")";
+  case DeclAttrKind::CDecl: {
+    auto Attr = cast<CDeclAttr>(this);
+    if (Attr->Underscored)
+      Printer << "@_cdecl(\"" << cast<CDeclAttr>(this)->Name << "\")";
+    else {
+      Printer << "@c";
+      if (!Attr->Name.empty())
+        Printer << "(" << cast<CDeclAttr>(this)->Name << ")";
+    }
     break;
+  }
 
   case DeclAttrKind::Expose: {
     Printer.printAttrName("@_expose");
@@ -1825,7 +1833,7 @@ StringRef DeclAttribute::getAttrName() const {
   case DeclAttrKind::CDecl:
     if (cast<CDeclAttr>(this)->Underscored)
       return "_cdecl";
-    return "cdecl";
+    return "c";
   case DeclAttrKind::SwiftNativeObjCRuntimeBase:
     return "_swift_native_objc_runtime_base";
   case DeclAttrKind::Semantics:

lib/AST/ClangTypeConverter.cpp

@@ -655,7 +655,7 @@ clang::QualType ClangTypeConverter::visitEnumType(EnumType *type) {
 
   auto ED = type->getDecl();
   if (!ED->isCCompatibleEnum())
-    // Can't translate something not marked with @objc or @cdecl.
+    // Can't translate something not marked with @objc or @c.
     return clang::QualType();
 
   // @objc enums lower to their raw types.

lib/AST/Type.cpp

@@ -3166,7 +3166,7 @@ getForeignRepresentable(Type type, ForeignLanguage language,
       if (isa<ClassDecl>(nominal) || isa<ProtocolDecl>(nominal))
         return failure();
 
-      // @objc enums are not representable in C, @cdecl ones and imported ones
+      // @objc enums are not representable in C, @c ones and imported ones
       // are ok.
       if (!nominal->hasClangNode())
         return failure();
@@ -3209,7 +3209,7 @@ getForeignRepresentable(Type type, ForeignLanguage language,
     }
   }
 
-  // @cdecl enums are representable in C and Objective-C.
+  // @c enums are representable in C and Objective-C.
   if (nominal->getAttrs().getAttribute<CDeclAttr>()) {
     return { ForeignRepresentableKind::Trivial, nullptr };
   }

lib/IRGen/GenEnum.cpp

@@ -6536,7 +6536,7 @@ EnumImplStrategy::get(TypeConverter &TC, SILType type, EnumDecl *theEnum) {
         std::move(elementsWithPayload), std::move(elementsWithNoPayload)));
   }
 
-  // Enums imported from Clang or marked with @objc or @cdecl use a
+  // Enums imported from Clang or marked with @objc or @c use a
   // C-compatible layout.
   if (theEnum->hasClangNode() || theEnum->isCCompatibleEnum()) {
     assert(elementsWithPayload.empty() && "C enum with payload?!");

lib/Parse/ParseDecl.cpp

@@ -3026,7 +3026,7 @@ ParserStatus Parser::parseNewDeclAttribute(DeclAttributes &Attributes,
   case DeclAttrKind::CDecl: {
     if (!AttrName.starts_with("_") &&
 
-        // Backwards support for @cdecl("stringId"). Remove before enabling in
+        // Backwards support for @c("stringId"). Remove before enabling in
         // production so we accept only the identifier format.
         lookahead<bool>(1, [&](CancellableBacktrackingScope &) {
            return Tok.isNot(tok::string_literal);