implement feedback

Author: ro-i

clang/include/clang/AST/OpenMPClause.h

@@ -1874,10 +1874,6 @@ class OMPMessageClause final : public OMPClause {
   // Expression of the 'message' clause.
   Stmt *MessageString = nullptr;
 
-  // The message as a StringLiteral in case it is as string literal. This might
-  // be needed during compile time.
-  StringLiteral *MessageStringLiteral = nullptr;
-
   /// Set message string of the clause.
   void setMessageString(Expr *MS) { MessageString = MS; }
 
@@ -1891,14 +1887,10 @@ class OMPMessageClause final : public OMPClause {
   /// \param StartLoc Starting location of the clause.
   /// \param LParenLoc Location of '('.
   /// \param EndLoc Ending location of the clause.
-  /// \param MessageStringLiteral The message as a StringLiteral in case it is
-  /// as string literal. This might be needed during compile time.
   OMPMessageClause(Expr *MS, SourceLocation StartLoc, SourceLocation LParenLoc,
-                   SourceLocation EndLoc,
-                   StringLiteral *MessageStringLiteral = nullptr)
+                   SourceLocation EndLoc)
       : OMPClause(llvm::omp::OMPC_message, StartLoc, EndLoc),
-        LParenLoc(LParenLoc), MessageString(MS),
-        MessageStringLiteral(MessageStringLiteral) {}
+        LParenLoc(LParenLoc), MessageString(MS) {}
 
   /// Build an empty clause.
   OMPMessageClause()
@@ -1911,9 +1903,12 @@ class OMPMessageClause final : public OMPClause {
   /// Returns message string of the clause.
   Expr *getMessageString() const { return cast_or_null<Expr>(MessageString); }
 
-  // Returns the source message as a string literal in case it has been a string
-  // literal. Otherwise, return null.
-  StringLiteral *getAsStringLiteral() const { return MessageStringLiteral; }
+  /// Try to evaluate the message string at compile time.
+  std::optional<std::string> tryEvaluateString(ASTContext &Ctx) const {
+    if (Expr *MessageExpr = getMessageString())
+      return MessageExpr->tryEvaluateString(Ctx);
+    return std::nullopt;
+  }
 
   child_range children() {
     return child_range(&MessageString, &MessageString + 1);

clang/lib/AST/OpenMPClause.cpp

@@ -1964,7 +1964,7 @@ void OMPClausePrinter::VisitOMPSeverityClause(OMPSeverityClause *Node) {
 
 void OMPClausePrinter::VisitOMPMessageClause(OMPMessageClause *Node) {
   OS << "message(";
-  if (StringLiteral *SL = Node->getAsStringLiteral())
+  if (StringLiteral *SL = dyn_cast<StringLiteral>(Node->getMessageString()))
     OS << "\"" << SL->getString() << "\"";
   else if (Expr *E = Node->getMessageString())
     E->printPretty(OS, nullptr, Policy);

clang/lib/Sema/SemaOpenMP.cpp

@@ -11097,26 +11097,27 @@ StmtResult SemaOpenMP::ActOnOpenMPErrorDirective(ArrayRef<OMPClause *> Clauses,
     return StmtError();
   }
 
-  const OMPSeverityClause *SeverityC =
-      OMPExecutableDirective::getSingleClause<OMPSeverityClause>(Clauses);
-  const OMPMessageClause *MessageC =
-      OMPExecutableDirective::getSingleClause<OMPMessageClause>(Clauses);
-
   if (!AtC || AtC->getAtKind() == OMPC_AT_compilation) {
-    StringLiteral *SL = MessageC ? MessageC->getAsStringLiteral() : nullptr;
+    const OMPSeverityClause *SeverityC =
+        OMPExecutableDirective::getSingleClause<OMPSeverityClause>(Clauses);
+    const OMPMessageClause *MessageC =
+        OMPExecutableDirective::getSingleClause<OMPMessageClause>(Clauses);
+    std::optional<std::string> SL =
+        MessageC ? MessageC->tryEvaluateString(getASTContext()) : std::nullopt;
+
     if (MessageC && !SL)
       Diag(MessageC->getMessageString()->getBeginLoc(),
            diag::warn_clause_expected_string_literal)
           << getOpenMPClauseNameForDiag(OMPC_message);
     if (SeverityC && SeverityC->getSeverityKind() == OMPC_SEVERITY_warning)
       Diag(SeverityC->getSeverityKindKwLoc(), diag::warn_diagnose_if_succeeded)
-          << (SL ? SL->getString() : "WARNING");
+          << SL.value_or("WARNING");
     else
-      Diag(StartLoc, diag::err_diagnose_if_succeeded)
-          << (SL ? SL->getString() : "ERROR");
+      Diag(StartLoc, diag::err_diagnose_if_succeeded) << SL.value_or("ERROR");
     if (!SeverityC || SeverityC->getSeverityKind() != OMPC_SEVERITY_warning)
       return StmtError();
   }
+
   return OMPErrorDirective::Create(getASTContext(), StartLoc, EndLoc, Clauses);
 }
 
@@ -16476,20 +16477,12 @@ OMPClause *SemaOpenMP::ActOnOpenMPMessageClause(Expr *ME,
     return nullptr;
   }
 
-  // If the string is a string literal, save it in case it is later needed
-  // during compile time.  Also consider a const char pointer to a string
-  // literal. This is necessary for template instantiations where the string
-  // literal is not passed directly and we only get a const char pointer to it.
-  StringLiteral *SL = dyn_cast<StringLiteral>(
-      isa<ImplicitCastExpr>(ME) ? cast<ImplicitCastExpr>(ME)->getSubExpr()
-                                : ME);
-
   // Convert array type to pointer type if needed.
   if (Type->isArrayType())
     ME = SemaRef.DefaultFunctionArrayConversion(ME).get();
 
   return new (getASTContext())
-      OMPMessageClause(ME, StartLoc, LParenLoc, EndLoc, SL);
+      OMPMessageClause(ME, StartLoc, LParenLoc, EndLoc);
 }
 
 OMPClause *SemaOpenMP::ActOnOpenMPOrderClause(