diff options
-rw-r--r-- | clang/include/clang/Basic/Attr.td | 3 | ||||
-rw-r--r-- | clang/test/OpenMP/declare_variant_ast_print.cpp | 9 |
2 files changed, 11 insertions, 1 deletions
diff --git a/clang/include/clang/Basic/Attr.td b/clang/include/clang/Basic/Attr.td index 6c71011ff2b..14834a1f541 100644 --- a/clang/include/clang/Basic/Attr.td +++ b/clang/include/clang/Basic/Attr.td @@ -3281,11 +3281,12 @@ def OMPAllocateDecl : InheritableAttr { let Documentation = [Undocumented]; } -def OMPDeclareVariant : Attr { +def OMPDeclareVariant : InheritableAttr { let Spellings = [Pragma<"omp", "declare variant">]; let Subjects = SubjectList<[Function]>; let SemaHandler = 0; let HasCustomParsing = 1; + let InheritEvenIfAlreadyPresent = 1; let Documentation = [OMPDeclareVariantDocs]; let Args = [ ExprArgument<"VariantFuncRef">, diff --git a/clang/test/OpenMP/declare_variant_ast_print.cpp b/clang/test/OpenMP/declare_variant_ast_print.cpp index a8c18f68228..1760751c803 100644 --- a/clang/test/OpenMP/declare_variant_ast_print.cpp +++ b/clang/test/OpenMP/declare_variant_ast_print.cpp @@ -148,6 +148,8 @@ auto fn_deduced1() { return 0; } // CHECK-NEXT: #pragma omp declare variant(SpecialFuncs::bar) match(implementation={vendor(llvm)}) // CHECK-NEXT: void foo1() { // CHECK-NEXT: } +// CHECK-NEXT: #pragma omp declare variant(SpecialFuncs::baz) match(implementation={vendor(unknown)}) +// CHECK-NEXT: void xxx(); // CHECK-NEXT: } s; struct SpecialFuncs { void vd() {} @@ -162,8 +164,15 @@ struct SpecialFuncs { #pragma omp declare variant(SpecialFuncs::bar) match(implementation={vendor(ibm)}, implementation={vendor(llvm)}) #pragma omp declare variant(SpecialFuncs::baz) match(implementation={vendor(unknown)}) void foo1() {} +#pragma omp declare variant(SpecialFuncs::baz) match(implementation={vendor(unknown)}) + void xxx(); } s; +// CHECK: #pragma omp declare variant(SpecialFuncs::baz) match(implementation={vendor(unknown)}) +// CHECK-NEXT: void SpecialFuncs::xxx() { +// CHECK-NEXT: } +void SpecialFuncs::xxx() {} + // CHECK: static void static_f_variant() { // CHECK-NEXT: } static void static_f_variant() {} |