Merge pull request #41284 from CodaFi/stay-inline-your-call-is-important-to-us

Author: swift-ci

include/swift/AST/DiagnosticsSema.def

@@ -5673,7 +5673,8 @@ ERROR(usable_from_inline_attr_with_explicit_access,
       (DeclName, AccessLevel))
 
 WARNING(inlinable_implies_usable_from_inline,none,
-        "'@inlinable' declaration is already '@usableFromInline'",())
+        "'@usableFromInline' attribute has no effect on '@inlinable' %0 %1",
+        (DescriptiveDeclKind, DeclName))
 
 ERROR(usable_from_inline_attr_in_protocol,none,
       "'@usableFromInline' attribute cannot be used in protocols", ())

lib/Sema/TypeCheckAttr.cpp

@@ -2417,7 +2417,8 @@ void AttributeChecker::visitUsableFromInlineAttr(UsableFromInlineAttr *attr) {
   // On internal declarations, @inlinable implies @usableFromInline.
   if (VD->getAttrs().hasAttribute<InlinableAttr>()) {
     if (Ctx.isSwiftVersionAtLeast(4,2))
-      diagnoseAndRemoveAttr(attr, diag::inlinable_implies_usable_from_inline);
+      diagnoseAndRemoveAttr(attr, diag::inlinable_implies_usable_from_inline,
+                            VD->getDescriptiveKind(), VD->getName());
     return;
   }
 }

test/Compatibility/attr_inlinable_old_spelling_42.swift

@@ -9,4 +9,4 @@
 // expected-warning@-1 {{'@_versioned' has been renamed to '@usableFromInline'}}{{2-12=usableFromInline}}
 
 @inlinable @usableFromInline func redundantAttribute() {}
-// expected-warning@-1 {{'@inlinable' declaration is already '@usableFromInline'}}
+// expected-warning@-1 {{'@usableFromInline' attribute has no effect on '@inlinable' global function 'redundantAttribute()'}}

test/attr/attr_inlinable.swift

@@ -6,7 +6,7 @@
 // expected-error@-1 {{'@inlinable' attribute cannot be applied to this declaration}}
 
 @inlinable @usableFromInline func redundantAttribute() {}
-// expected-warning@-1 {{'@inlinable' declaration is already '@usableFromInline'}}
+// expected-warning@-1 {{'@usableFromInline' attribute has no effect on '@inlinable' global function 'redundantAttribute()'}} {{12-30=}}
 
 private func privateFunction() {}
 // expected-note@-1 2{{global function 'privateFunction()' is not '@usableFromInline' or public}}