Address comments

Author: philnik777

clang/lib/Parse/ParseDeclCXX.cpp

@@ -1611,7 +1611,29 @@ void Parser::ParseClassSpecifier(tok::TokenKind TagTokKind,
       Tok.isOneOf(
 #define TRANSFORM_TYPE_TRAIT_DEF(_, Trait) tok::kw___##Trait,
 #include "clang/Basic/TransformTypeTraits.def"
-          tok::kw___is_convertible, // Last use in libc++ was removed in 925a11a
+          tok::kw___is_abstract,
+          tok::kw___is_aggregate,
+          tok::kw___is_arithmetic,
+          tok::kw___is_array,
+          tok::kw___is_assignable,
+          tok::kw___is_base_of,
+          tok::kw___is_bounded_array,
+          tok::kw___is_class,
+          tok::kw___is_complete_type,
+          tok::kw___is_compound,
+          tok::kw___is_const,
+          tok::kw___is_constructible,
+          tok::kw___is_convertible,
+          tok::kw___is_convertible_to,
+          tok::kw___is_destructible,
+          tok::kw___is_empty,
+          tok::kw___is_enum,
+          tok::kw___is_floating_point,
+          tok::kw___is_final,
+          tok::kw___is_function,
+          tok::kw___is_fundamental,
+          tok::kw___is_integral,
+          tok::kw___is_interface_class,
           tok::kw___is_literal,
           tok::kw___is_lvalue_expr,
           tok::kw___is_lvalue_reference,

clang/lib/Sema/SemaChecking.cpp

@@ -5409,14 +5409,15 @@ ExprResult Sema::ConvertVectorExpr(Expr *E, TypeSourceInfo *TInfo,
 }
 
 ExprResult Sema::BuiltinInvoke(CallExpr *TheCall) {
-  auto Loc = TheCall->getBeginLoc();
+  SourceLocation Loc = TheCall->getBeginLoc();
   auto Args = MutableArrayRef(TheCall->getArgs(), TheCall->getNumArgs());
   assert(llvm::none_of(Args,
                        [](Expr *Arg) { return Arg->isTypeDependent(); }));
 
   if (Args.size() == 0) {
     Diag(TheCall->getBeginLoc(), diag::err_typecheck_call_too_few_args_at_least)
-        << 0 << 1 << 0 << 0 << TheCall->getSourceRange();
+        << /*callee_type=*/0 << /*min_arg_count=*/1 << /*actual_arg_count=*/0
+        << /*is_non_object=*/0 << TheCall->getSourceRange();
     return ExprError();
   }
 
@@ -5425,8 +5426,9 @@ ExprResult Sema::BuiltinInvoke(CallExpr *TheCall) {
   if (auto *MPT = FuncT->getAs<MemberPointerType>()) {
     if (Args.size() < 2) {
       Diag(TheCall->getBeginLoc(),
-            diag::err_typecheck_call_too_few_args_at_least)
-          << 0 << 2 << 1 << 0 << TheCall->getSourceRange();
+           diag::err_typecheck_call_too_few_args_at_least)
+          << /*callee_type=*/0 << /*min_arg_count=*/2 << /*actual_arg_count=*/1
+          << /*is_non_object=*/0 << TheCall->getSourceRange();
       return ExprError();
     }
 

clang/test/SemaCXX/builtin-invoke.cpp

@@ -131,3 +131,12 @@ void test3() {
   __builtin_invoke(diagnose_discard); // expected-warning {{ignoring return value of function declared with 'nodiscard' attribute}}
   __builtin_invoke(no_diagnose_discard);
 }
+
+template <class T>
+auto test(T v) {
+  return __builtin_invoke(v);
+}
+
+auto call2() {
+  test(call);
+}