change option name in invalid constexpr diagnostic

Author: ayokunle321

clang/include/clang/Basic/DiagnosticASTKinds.td

@@ -12,7 +12,7 @@ let Component = "AST" in {
 def note_expr_divide_by_zero : Note<"division by zero">;
 def note_constexpr_invalid_cast : Note<
   "%enum_select<ConstexprInvalidCastKind>{%Reinterpret{reinterpret_cast}|%Dynamic{dynamic_cast}|"
-  "%ThisCastOrReinterpret{%select{this conversion|cast that performs the conversions "
+  "%ThisConversionOrReinterpret{%select{this conversion|cast that performs the conversions "
   "of a reinterpret_cast}1}|%CastFrom{cast from %1}}0"
   " is not allowed in a constant expression"
   "%select{| in C++ standards before C++20||}0">;

clang/lib/AST/ByteCode/Interp.h

@@ -2372,7 +2372,7 @@ static inline bool PtrPtrCast(InterpState &S, CodePtr OpPC, bool SrcIsVoidPtr) {
   } else {
     const SourceInfo &E = S.Current->getSource(OpPC);
     S.CCEDiag(E, diag::note_constexpr_invalid_cast)
-        << diag::ConstexprInvalidCastKind::ThisCastOrReinterpret
+        << diag::ConstexprInvalidCastKind::ThisConversionOrReinterpret
         << S.getLangOpts().CPlusPlus << S.Current->getRange(OpPC);
   }
 
@@ -2738,7 +2738,7 @@ inline bool GetIntPtr(InterpState &S, CodePtr OpPC, const Descriptor *Desc) {
 
   if (Desc)
     S.CCEDiag(S.Current->getSource(OpPC), diag::note_constexpr_invalid_cast)
-        << diag::ConstexprInvalidCastKind::ThisCastOrReinterpret
+        << diag::ConstexprInvalidCastKind::ThisConversionOrReinterpret
         << S.getLangOpts().CPlusPlus;
 
   S.Stk.push<Pointer>(static_cast<uint64_t>(IntVal), Desc);

clang/lib/AST/ExprConstant.cpp

@@ -8835,7 +8835,7 @@ class LValueExprEvaluator
 
     case CK_LValueBitCast:
       this->CCEDiag(E, diag::note_constexpr_invalid_cast)
-          << diag::ConstexprInvalidCastKind::ThisCastOrReinterpret
+          << diag::ConstexprInvalidCastKind::ThisConversionOrReinterpret
           << Info.Ctx.getLangOpts().CPlusPlus;
       if (!Visit(E->getSubExpr()))
         return false;
@@ -9677,7 +9677,7 @@ bool PointerExprEvaluator::VisitCastExpr(const CastExpr *E) {
                 << SubExpr->getType();
         } else
           CCEDiag(E, diag::note_constexpr_invalid_cast)
-              << diag::ConstexprInvalidCastKind::ThisCastOrReinterpret
+              << diag::ConstexprInvalidCastKind::ThisConversionOrReinterpret
               << Info.Ctx.getLangOpts().CPlusPlus;
         Result.Designator.setInvalid();
       }
@@ -9717,7 +9717,7 @@ bool PointerExprEvaluator::VisitCastExpr(const CastExpr *E) {
 
   case CK_IntegralToPointer: {
     CCEDiag(E, diag::note_constexpr_invalid_cast)
-        << diag::ConstexprInvalidCastKind::ThisCastOrReinterpret
+        << diag::ConstexprInvalidCastKind::ThisConversionOrReinterpret
         << Info.Ctx.getLangOpts().CPlusPlus;
 
     APValue Value;
@@ -11183,7 +11183,7 @@ bool VectorExprEvaluator::VisitCastExpr(const CastExpr *E) {
       // Give up if the input isn't an int, float, or vector.  For example, we
       // reject "(v4i16)(intptr_t)&a".
       Info.FFDiag(E, diag::note_constexpr_invalid_cast)
-          << diag::ConstexprInvalidCastKind::ThisCastOrReinterpret
+          << diag::ConstexprInvalidCastKind::ThisConversionOrReinterpret
           << Info.Ctx.getLangOpts().CPlusPlus;
       return false;
     }
@@ -15203,7 +15203,7 @@ bool IntExprEvaluator::VisitCastExpr(const CastExpr *E) {
 
   case CK_PointerToIntegral: {
     CCEDiag(E, diag::note_constexpr_invalid_cast)
-        << diag::ConstexprInvalidCastKind::ThisCastOrReinterpret
+        << diag::ConstexprInvalidCastKind::ThisConversionOrReinterpret
         << Info.Ctx.getLangOpts().CPlusPlus << E->getSourceRange();
 
     LValue LV;