Allow identification of OSLogMessage by a @_semantics attribute instead of just name (#39455)

Author: kubamracek

include/swift/AST/SemanticAttrs.def

@@ -75,6 +75,7 @@ SEMANTICS_ATTR(OPTIMIZE_SIL_SPECIALIZE_GENERIC_SIZE_NEVER,
 SEMANTICS_ATTR(OPTIMIZE_SIL_SPECIALIZE_OWNED2GUARANTEE_NEVER,
           "optimize.sil.specialize.owned2guarantee.never")
 
+SEMANTICS_ATTR(OSLOG_MESSAGE_TYPE, "oslog.message.type")
 SEMANTICS_ATTR(OSLOG_MESSAGE_INIT_INTERPOLATION, "oslog.message.init_interpolation")
 SEMANTICS_ATTR(OSLOG_MESSAGE_INIT_STRING_LITERAL, "oslog.message.init_stringliteral")
 SEMANTICS_ATTR(OSLOG_REQUIRES_CONSTANT_ARGUMENTS, "oslog.requires_constant_arguments")

lib/SILOptimizer/Mandatory/OSLogOptimization.cpp

@@ -1510,8 +1510,8 @@ static ApplyInst *getAsOSLogMessageInit(SILInstruction *inst) {
 }
 
 /// Return true iff the SIL function \c fun is a method of the \c OSLogMessage
-/// type.
-bool isMethodOfOSLogMessage(SILFunction &fun) {
+/// type or a type that has the @_semantics("oslog.message.type") annotation.
+static bool isMethodOfOSLogMessage(SILFunction &fun) {
   DeclContext *declContext = fun.getDeclContext();
   if (!declContext)
     return false;
@@ -1527,7 +1527,8 @@ bool isMethodOfOSLogMessage(SILFunction &fun) {
   NominalTypeDecl *typeDecl = parentContext->getSelfNominalTypeDecl();
   if (!typeDecl)
     return false;
-  return typeDecl->getName() == fun.getASTContext().Id_OSLogMessage;
+  return typeDecl->getName() == fun.getASTContext().Id_OSLogMessage
+    || typeDecl->hasSemanticsAttr(semantics::OSLOG_MESSAGE_TYPE);
 }
 
 class OSLogOptimization : public SILFunctionTransform {

lib/Sema/ConstantnessSemaDiagnostics.cpp

@@ -284,7 +284,8 @@ static void diagnoseError(Expr *errorExpr, const ASTContext &astContext,
   }
   // If this is OSLogMessage, it should be a string-interpolation literal.
   Identifier declName = nominalDecl->getName();
-  if (declName == astContext.Id_OSLogMessage) {
+  if (declName == astContext.Id_OSLogMessage ||
+      nominalDecl->hasSemanticsAttr(semantics::OSLOG_MESSAGE_TYPE)) {
     diags.diagnose(errorLoc, diag::oslog_message_must_be_string_interpolation);
     return;
   }

stdlib/private/OSLog/OSLogTestHelper.swift

@@ -121,7 +121,7 @@ internal func _os_log_impl_test(
 /// on the special case of animation begin signposts.
 @_transparent
 public func _osSignpostAnimationBeginTestHelper(
-  _ format: AnimationFormatString.OSLogMessage,
+  _ format: AnimationFormatString.MyLogMessage,
   _ arguments: CVarArg...
 ) {
   _animationBeginSignpostHelper(formatStringPointer: format.formatStringPointer,
@@ -149,7 +149,8 @@ public enum AnimationFormatString {
   }
 
   @frozen
-  public struct OSLogMessage : ExpressibleByStringLiteral {
+  @_semantics("oslog.message.type")
+  public struct MyLogMessage : ExpressibleByStringLiteral {
     @usableFromInline
     var formatStringPointer: UnsafePointer<CChar>