fix tests

Author: cor3ntin

clang/include/clang/AST/Stmt.h

@@ -531,7 +531,7 @@ class alignas(void *) Stmt {
     unsigned : NumExprBits;
 
     LLVM_PREFERRED_TYPE(UnaryExprOrTypeTrait)
-    unsigned Kind : 3;
+    unsigned Kind : 4;
     LLVM_PREFERRED_TYPE(bool)
     unsigned IsType : 1; // true if operand is a type, false if an expression.
   };

clang/lib/Sema/SemaDeclCXX.cpp

@@ -17320,13 +17320,21 @@ void Sema::DiagnoseStaticAssertDetails(const Expr *E) {
     if (!UsefulToPrintExpr(LHS) && !UsefulToPrintExpr(RHS))
       return;
 
+    auto UseCachedValue = [](const Expr *Outer, const Expr *Inner) {
+      if (const ConstantExpr *E = dyn_cast<ConstantExpr>(Outer);
+          E && !E->getAPValueResult().isAbsent())
+        return Outer;
+      return Inner;
+    };
+
     struct {
       const clang::Expr *Cond;
       Expr::EvalResult Result;
       SmallString<12> ValueString;
       bool Print;
-    } DiagSide[2] = {{Op->getLHS(), Expr::EvalResult(), {}, false},
-                     {Op->getRHS(), Expr::EvalResult(), {}, false}};
+    } DiagSide[2] = {
+        {UseCachedValue(Op->getLHS(), LHS), Expr::EvalResult(), {}, false},
+        {UseCachedValue(Op->getRHS(), RHS), Expr::EvalResult(), {}, false}};
     for (unsigned I = 0; I < 2; I++) {
       const Expr *Side = DiagSide[I].Cond;