diff --git a/clang/lib/Sema/SemaTemplateInstantiate.cpp b/clang/lib/Sema/SemaTemplateInstantiate.cpp --- a/clang/lib/Sema/SemaTemplateInstantiate.cpp +++ b/clang/lib/Sema/SemaTemplateInstantiate.cpp @@ -1056,6 +1056,7 @@ const LoopHintAttr *TransformLoopHintAttr(const LoopHintAttr *LH); ExprResult TransformPredefinedExpr(PredefinedExpr *E); + ExprResult TransformCallExpr(CallExpr *E); ExprResult TransformDeclRefExpr(DeclRefExpr *E); ExprResult TransformCXXDefaultArgExpr(CXXDefaultArgExpr *E); @@ -1688,6 +1689,17 @@ return RebuildVarDeclRefExpr(cast(TransformedDecl), E->getExprLoc()); } +ExprResult TemplateInstantiator::TransformCallExpr(CallExpr *E) { + ExprResult R = TreeTransform::TransformCallExpr(E); + if (!SemaRef.getLangOpts().OpenMP || !R.isUsable() || !isa(R.get())) + return R; + + auto *CE = cast(R.get()); + return SemaRef.ActOnOpenMPCall(R, nullptr, CE->getRParenLoc(), + MultiExprArg(CE->getArgs(), CE->getNumArgs()), + CE->getRParenLoc(), nullptr); +} + ExprResult TemplateInstantiator::TransformDeclRefExpr(DeclRefExpr *E) { NamedDecl *D = E->getDecl(); diff --git a/clang/test/AST/ast-dump-openmp-begin-declare-variant_template_1.cpp b/clang/test/AST/ast-dump-openmp-begin-declare-variant_template_1.cpp new file mode 100644 --- /dev/null +++ b/clang/test/AST/ast-dump-openmp-begin-declare-variant_template_1.cpp @@ -0,0 +1,160 @@ +// RUN: %clang_cc1 -triple x86_64-unknown-unknown -fopenmp -verify -ast-dump %s | FileCheck %s +// RUN: %clang_cc1 -triple x86_64-unknown-unknown -fopenmp -verify -ast-dump %s -x c++| FileCheck %s +// expected-no-diagnostics + +int also_before() { + return 1; +} + +#pragma omp begin declare variant match(implementation={vendor(score(100):llvm)}) +int also_after(void) { + return 2; +} +int also_after(int) { + return 3; +} +int also_after(double) { + return 0; +} +#pragma omp end declare variant +#pragma omp begin declare variant match(implementation={vendor(score(0):llvm)}) +int also_before() { + return 0; +} +#pragma omp end declare variant + +int also_after(void) { + return 4; +} +int also_after(int) { + return 5; +} +int also_after(double) { + return 6; +} + +template +int test1() { + // Should return 0. + return also_after(T(0)); +} + +typedef int(*Ty)(); + +template +int test2() { + // Should return 0. + return fn(); +} + +int test() { + // Should return 0. + return test1() + test2(); +} + + +// CHECK: |-FunctionDecl [[ADDR_0:0x[a-z0-9]*]] <{{.*}}, line:7:1> line:5:5 implicit used also_before 'int ({{.*}})' +// CHECK-NEXT: | |-CompoundStmt [[ADDR_1:0x[a-z0-9]*]] +// CHECK-NEXT: | | `-ReturnStmt [[ADDR_2:0x[a-z0-9]*]] +// CHECK-NEXT: | | `-IntegerLiteral [[ADDR_3:0x[a-z0-9]*]] 'int' 1 +// CHECK-NEXT: | `-OMPDeclareVariantAttr [[ADDR_4:0x[a-z0-9]*]] <> Implicit implementation={vendor(score(0): llvm)} +// CHECK-NEXT: | `-DeclRefExpr [[ADDR_5:0x[a-z0-9]*]] 'int ({{.*}})' Function [[ADDR_6:0x[a-z0-9]*]] 'also_before[implementation={vendor(llvm)}]' 'int ({{.*}})' +// CHECK-NEXT: |-FunctionDecl [[ADDR_7:0x[a-z0-9]*]] col:5 implicit also_after 'int ({{.*}})' +// CHECK-NEXT: | |-OMPDeclareVariantAttr [[ADDR_8:0x[a-z0-9]*]] <> Implicit implementation={vendor(score(100): llvm)} +// CHECK-NEXT: | | `-DeclRefExpr [[ADDR_9:0x[a-z0-9]*]] 'int ({{.*}})' Function [[ADDR_10:0x[a-z0-9]*]] 'also_after[implementation={vendor(llvm)}]' 'int ({{.*}})' +// CHECK-NEXT: | |-OMPDeclareVariantAttr [[ADDR_11:0x[a-z0-9]*]] <> Implicit implementation={vendor(score(100): llvm)} +// CHECK-NEXT: | | `-DeclRefExpr [[ADDR_12:0x[a-z0-9]*]] 'int (int)' Function [[ADDR_13:0x[a-z0-9]*]] 'also_after[implementation={vendor(llvm)}]' 'int (int)' +// CHECK-NEXT: | `-OMPDeclareVariantAttr [[ADDR_14:0x[a-z0-9]*]] <> Implicit implementation={vendor(score(100): llvm)} +// CHECK-NEXT: | `-DeclRefExpr [[ADDR_15:0x[a-z0-9]*]] 'int (double)' Function [[ADDR_16:0x[a-z0-9]*]] 'also_after[implementation={vendor(llvm)}]' 'int (double)' +// CHECK-NEXT: |-FunctionDecl [[ADDR_10]] line:10:1 also_after[implementation={vendor(llvm)}] 'int ({{.*}})' +// CHECK-NEXT: | `-CompoundStmt [[ADDR_17:0x[a-z0-9]*]] +// CHECK-NEXT: | `-ReturnStmt [[ADDR_18:0x[a-z0-9]*]] +// CHECK-NEXT: | `-IntegerLiteral [[ADDR_19:0x[a-z0-9]*]] 'int' 2 +// CHECK-NEXT: |-FunctionDecl [[ADDR_13]] line:13:1 also_after[implementation={vendor(llvm)}] 'int (int)' +// CHECK-NEXT: | |-ParmVarDecl [[ADDR_20:0x[a-z0-9]*]] col:19 'int' +// CHECK-NEXT: | `-CompoundStmt [[ADDR_21:0x[a-z0-9]*]] +// CHECK-NEXT: | `-ReturnStmt [[ADDR_22:0x[a-z0-9]*]] +// CHECK-NEXT: | `-IntegerLiteral [[ADDR_23:0x[a-z0-9]*]] 'int' 3 +// CHECK-NEXT: |-FunctionDecl [[ADDR_16]] line:16:1 also_after[implementation={vendor(llvm)}] 'int (double)' +// CHECK-NEXT: | |-ParmVarDecl [[ADDR_24:0x[a-z0-9]*]] col:22 'double' +// CHECK-NEXT: | `-CompoundStmt [[ADDR_25:0x[a-z0-9]*]] +// CHECK-NEXT: | `-ReturnStmt [[ADDR_26:0x[a-z0-9]*]] +// CHECK-NEXT: | `-IntegerLiteral [[ADDR_27:0x[a-z0-9]*]] 'int' 0 +// CHECK-NEXT: |-FunctionDecl [[ADDR_6]] line:21:1 also_before[implementation={vendor(llvm)}] 'int ({{.*}})' +// CHECK-NEXT: | `-CompoundStmt [[ADDR_28:0x[a-z0-9]*]] +// CHECK-NEXT: | `-ReturnStmt [[ADDR_29:0x[a-z0-9]*]] +// CHECK-NEXT: | `-IntegerLiteral [[ADDR_30:0x[a-z0-9]*]] 'int' 0 +// CHECK-NEXT: |-FunctionDecl [[ADDR_31:0x[a-z0-9]*]] prev [[ADDR_7]] line:26:5 also_after 'int ({{.*}})' +// CHECK-NEXT: | |-CompoundStmt [[ADDR_32:0x[a-z0-9]*]] +// CHECK-NEXT: | | `-ReturnStmt [[ADDR_33:0x[a-z0-9]*]] +// CHECK-NEXT: | | `-IntegerLiteral [[ADDR_34:0x[a-z0-9]*]] 'int' 4 +// CHECK-NEXT: | |-OMPDeclareVariantAttr [[ADDR_35:0x[a-z0-9]*]] <> Inherited Implicit implementation={vendor(score(100): llvm)} +// CHECK-NEXT: | | `-DeclRefExpr [[ADDR_9]] 'int ({{.*}})' Function [[ADDR_10]] 'also_after[implementation={vendor(llvm)}]' 'int ({{.*}})' +// CHECK-NEXT: | |-OMPDeclareVariantAttr [[ADDR_36:0x[a-z0-9]*]] <> Inherited Implicit implementation={vendor(score(100): llvm)} +// CHECK-NEXT: | | `-DeclRefExpr [[ADDR_12]] 'int (int)' Function [[ADDR_13]] 'also_after[implementation={vendor(llvm)}]' 'int (int)' +// CHECK-NEXT: | `-OMPDeclareVariantAttr [[ADDR_37:0x[a-z0-9]*]] <> Inherited Implicit implementation={vendor(score(100): llvm)} +// CHECK-NEXT: | `-DeclRefExpr [[ADDR_15]] 'int (double)' Function [[ADDR_16]] 'also_after[implementation={vendor(llvm)}]' 'int (double)' +// CHECK-NEXT: |-FunctionDecl [[ADDR_38:0x[a-z0-9]*]] line:29:5 also_after 'int (int)' +// CHECK-NEXT: | |-ParmVarDecl [[ADDR_39:0x[a-z0-9]*]] col:19 'int' +// CHECK-NEXT: | `-CompoundStmt [[ADDR_40:0x[a-z0-9]*]] +// CHECK-NEXT: | `-ReturnStmt [[ADDR_41:0x[a-z0-9]*]] +// CHECK-NEXT: | `-IntegerLiteral [[ADDR_42:0x[a-z0-9]*]] 'int' 5 +// CHECK-NEXT: |-FunctionDecl [[ADDR_43:0x[a-z0-9]*]] line:32:5 used also_after 'int (double)' +// CHECK-NEXT: | |-ParmVarDecl [[ADDR_44:0x[a-z0-9]*]] col:22 'double' +// CHECK-NEXT: | `-CompoundStmt [[ADDR_45:0x[a-z0-9]*]] +// CHECK-NEXT: | `-ReturnStmt [[ADDR_46:0x[a-z0-9]*]] +// CHECK-NEXT: | `-IntegerLiteral [[ADDR_47:0x[a-z0-9]*]] 'int' 6 +// CHECK-NEXT: |-FunctionTemplateDecl [[ADDR_48:0x[a-z0-9]*]] line:37:5 test1 +// CHECK-NEXT: | |-TemplateTypeParmDecl [[ADDR_49:0x[a-z0-9]*]] col:19 referenced typename depth 0 index 0 T +// CHECK-NEXT: | |-FunctionDecl [[ADDR_50:0x[a-z0-9]*]] line:37:5 test1 'int ({{.*}})' +// CHECK-NEXT: | | `-CompoundStmt [[ADDR_51:0x[a-z0-9]*]] +// CHECK-NEXT: | | `-ReturnStmt [[ADDR_52:0x[a-z0-9]*]] +// CHECK-NEXT: | | `-CallExpr [[ADDR_53:0x[a-z0-9]*]] '' +// CHECK-NEXT: | | |-UnresolvedLookupExpr [[ADDR_54:0x[a-z0-9]*]] '' {{.*}}(ADL) = 'also_after' [[ADDR_43]] [[ADDR_38]] [[ADDR_31]] +// CHECK-NEXT: | | `-CXXUnresolvedConstructExpr [[ADDR_55:0x[a-z0-9]*]] 'T' 'T' +// CHECK-NEXT: | | `-IntegerLiteral [[ADDR_56:0x[a-z0-9]*]] 'int' 0 +// CHECK-NEXT: | `-FunctionDecl [[ADDR_57:0x[a-z0-9]*]] line:37:5 used test1 'int ({{.*}})' +// CHECK-NEXT: | |-TemplateArgument type 'double' +// CHECK-NEXT: | `-CompoundStmt [[ADDR_58:0x[a-z0-9]*]] +// CHECK-NEXT: | `-ReturnStmt [[ADDR_59:0x[a-z0-9]*]] +// CHECK-NEXT: | `-CallExpr [[ADDR_60:0x[a-z0-9]*]] 'int' +// CHECK-NEXT: | |-ImplicitCastExpr [[ADDR_61:0x[a-z0-9]*]] 'int (*)(double)' +// CHECK-NEXT: | | `-DeclRefExpr [[ADDR_62:0x[a-z0-9]*]] 'int (double)' {{.*}}Function [[ADDR_43]] 'also_after' 'int (double)' +// CHECK-NEXT: | `-CXXFunctionalCastExpr [[ADDR_63:0x[a-z0-9]*]] 'double':'double' functional cast to double +// CHECK-NEXT: | `-ImplicitCastExpr [[ADDR_64:0x[a-z0-9]*]] 'double':'double' part_of_explicit_cast +// CHECK-NEXT: | `-IntegerLiteral [[ADDR_56]] 'int' 0 +// CHECK-NEXT: |-TypedefDecl [[ADDR_65:0x[a-z0-9]*]] col:14 referenced Ty 'int (*)({{.*}})' +// CHECK-NEXT: | `-PointerType [[ADDR_66:0x[a-z0-9]*]] 'int (*)({{.*}})' +// CHECK-NEXT: | `-ParenType [[ADDR_67:0x[a-z0-9]*]] 'int ({{.*}})' sugar +// CHECK-NEXT: | `-FunctionProtoType [[ADDR_68:0x[a-z0-9]*]] 'int ({{.*}})' cdecl +// CHECK-NEXT: | `-BuiltinType [[ADDR_69:0x[a-z0-9]*]] 'int' +// CHECK-NEXT: |-FunctionTemplateDecl [[ADDR_70:0x[a-z0-9]*]] line:45:5 test2 +// CHECK-NEXT: | |-NonTypeTemplateParmDecl [[ADDR_71:0x[a-z0-9]*]] col:13 referenced 'Ty':'int (*)({{.*}})' depth 0 index 0 fn +// CHECK-NEXT: | |-FunctionDecl [[ADDR_72:0x[a-z0-9]*]] line:45:5 test2 'int ({{.*}})' +// CHECK-NEXT: | | `-CompoundStmt [[ADDR_73:0x[a-z0-9]*]] +// CHECK-NEXT: | | `-ReturnStmt [[ADDR_74:0x[a-z0-9]*]] +// CHECK-NEXT: | | `-CallExpr [[ADDR_75:0x[a-z0-9]*]] 'int' +// CHECK-NEXT: | | `-DeclRefExpr [[ADDR_76:0x[a-z0-9]*]] 'Ty':'int (*)({{.*}})' NonTypeTemplateParm [[ADDR_71]] 'fn' 'Ty':'int (*)({{.*}})' +// CHECK-NEXT: | `-FunctionDecl [[ADDR_77:0x[a-z0-9]*]] line:45:5 used test2 'int ({{.*}})' +// CHECK-NEXT: | |-TemplateArgument decl +// CHECK-NEXT: | | `-Function [[ADDR_0]] 'also_before' 'int ({{.*}})' +// CHECK-NEXT: | `-CompoundStmt [[ADDR_78:0x[a-z0-9]*]] +// CHECK-NEXT: | `-ReturnStmt [[ADDR_79:0x[a-z0-9]*]] +// CHECK-NEXT: | `-PseudoObjectExpr [[ADDR_80:0x[a-z0-9]*]] 'int' +// CHECK-NEXT: | |-CallExpr [[ADDR_81:0x[a-z0-9]*]] 'int' +// CHECK-NEXT: | | `-SubstNonTypeTemplateParmExpr [[ADDR_82:0x[a-z0-9]*]] 'int (*)({{.*}})' +// CHECK-NEXT: | | `-UnaryOperator [[ADDR_83:0x[a-z0-9]*]] 'int (*)({{.*}})' prefix '&' cannot overflow +// CHECK-NEXT: | | `-DeclRefExpr [[ADDR_84:0x[a-z0-9]*]] 'int ({{.*}})' {{.*}}Function [[ADDR_0]] 'also_before' 'int ({{.*}})' +// CHECK-NEXT: | `-CallExpr [[ADDR_85:0x[a-z0-9]*]] 'int' +// CHECK-NEXT: | `-ImplicitCastExpr [[ADDR_86:0x[a-z0-9]*]] 'int (*)({{.*}})' +// CHECK-NEXT: | `-DeclRefExpr [[ADDR_5]] 'int ({{.*}})' Function [[ADDR_6]] 'also_before[implementation={vendor(llvm)}]' 'int ({{.*}})' +// CHECK-NEXT: `-FunctionDecl [[ADDR_87:0x[a-z0-9]*]] line:50:5 test 'int ({{.*}})' +// CHECK-NEXT: `-CompoundStmt [[ADDR_88:0x[a-z0-9]*]] +// CHECK-NEXT: `-ReturnStmt [[ADDR_89:0x[a-z0-9]*]] +// CHECK-NEXT: `-BinaryOperator [[ADDR_90:0x[a-z0-9]*]] 'int' '+' +// CHECK-NEXT: |-CallExpr [[ADDR_91:0x[a-z0-9]*]] 'int' +// CHECK-NEXT: | `-ImplicitCastExpr [[ADDR_92:0x[a-z0-9]*]] 'int (*)({{.*}})' +// CHECK-NEXT: | `-DeclRefExpr [[ADDR_93:0x[a-z0-9]*]] 'int ({{.*}})' {{.*}}Function [[ADDR_57]] 'test1' 'int ({{.*}})' (FunctionTemplate [[ADDR_48]] 'test1') +// CHECK-NEXT: `-CallExpr [[ADDR_94:0x[a-z0-9]*]] 'int' +// CHECK-NEXT: `-ImplicitCastExpr [[ADDR_95:0x[a-z0-9]*]] 'int (*)({{.*}})' +// CHECK-NEXT: `-DeclRefExpr [[ADDR_96:0x[a-z0-9]*]] 'int ({{.*}})' {{.*}}Function [[ADDR_77]] 'test2' 'int ({{.*}})' (FunctionTemplate [[ADDR_70]] 'test2')