https://github.com/susmonteiro updated https://github.com/llvm/llvm-project/pull/173386
>From 52319aac26f5090adbc5f4c3964b66ff75c1e886 Mon Sep 17 00:00:00 2001 From: susmonteiro <[email protected]> Date: Tue, 23 Dec 2025 14:56:05 +0000 Subject: [PATCH] [APINotes] Avoid duplicate attributes when fields instantiate class templates --- clang/lib/Sema/SemaDecl.cpp | 3 ++- clang/test/APINotes/Inputs/Headers/Templates.apinotes | 2 ++ clang/test/APINotes/Inputs/Headers/Templates.h | 9 +++++++++ clang/test/APINotes/templates.cpp | 11 +++++++++++ 4 files changed, 24 insertions(+), 1 deletion(-) diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp index 5da665a5acad2..c44f4bd6b331a 100644 --- a/clang/lib/Sema/SemaDecl.cpp +++ b/clang/lib/Sema/SemaDecl.cpp @@ -20161,7 +20161,8 @@ void Sema::ActOnFields(Scope *S, SourceLocation RecLoc, Decl *EnclosingDecl, CDecl->setIvarRBraceLoc(RBrac); } } - ProcessAPINotes(Record); + if (!isa<ClassTemplateSpecializationDecl>(Record)) + ProcessAPINotes(Record); } // Given an integral type, return the next larger integral type diff --git a/clang/test/APINotes/Inputs/Headers/Templates.apinotes b/clang/test/APINotes/Inputs/Headers/Templates.apinotes index b7336484da0c7..ded688b5a9076 100644 --- a/clang/test/APINotes/Inputs/Headers/Templates.apinotes +++ b/clang/test/APINotes/Inputs/Headers/Templates.apinotes @@ -3,3 +3,5 @@ Name: Templates Tags: - Name: Box SwiftImportAs: owned +- Name: MoveOnly + SwiftCopyable: false diff --git a/clang/test/APINotes/Inputs/Headers/Templates.h b/clang/test/APINotes/Inputs/Headers/Templates.h index 2a86a46d4af27..cdb7c3b3fa2c0 100644 --- a/clang/test/APINotes/Inputs/Headers/Templates.h +++ b/clang/test/APINotes/Inputs/Headers/Templates.h @@ -8,3 +8,12 @@ struct Box { using FloatBox = Box<float>; using IntBox = Box<int>; + +template <typename T> +struct MoveOnly { + T value; +}; + +struct MoveOnlyBox { + MoveOnly<int> value; +}; diff --git a/clang/test/APINotes/templates.cpp b/clang/test/APINotes/templates.cpp index 48109011e73a9..6d8b65a0d5f85 100644 --- a/clang/test/APINotes/templates.cpp +++ b/clang/test/APINotes/templates.cpp @@ -1,6 +1,7 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %clang_cc1 -fmodules -fblocks -fimplicit-module-maps -fmodules-cache-path=%t/ModulesCache/Tmpl -fdisable-module-hash -fapinotes-modules -fsyntax-only -I %S/Inputs/Headers -F %S/Inputs/Frameworks %s -x c++ // RUN: %clang_cc1 -fmodules -fblocks -fimplicit-module-maps -fmodules-cache-path=%t/ModulesCache/Tmpl -fdisable-module-hash -fapinotes-modules -I %S/Inputs/Headers -F %S/Inputs/Frameworks %s -ast-dump -ast-dump-filter Box -x c++ | FileCheck -check-prefix=CHECK-BOX %s +// RUN: %clang_cc1 -fmodules -fblocks -fimplicit-module-maps -fmodules-cache-path=%t/ModulesCache/Tmpl -fdisable-module-hash -fapinotes-modules -I %S/Inputs/Headers -F %S/Inputs/Frameworks %s -ast-dump -ast-dump-filter MoveOnly -x c++ | FileCheck -check-prefix=CHECK-MOVEONLY %s #include "Templates.h" @@ -10,3 +11,13 @@ // Make sure the attributes aren't duplicated. // CHECK-BOX-NOT: SwiftAttrAttr {{.+}} <<invalid sloc>> "import_owned" + +// CHECK-MOVEONLY: Dumping MoveOnly: +// CHECK-MOVEONLY-NEXT: ClassTemplateDecl {{.+}} imported in Templates MoveOnly +// CHECK-MOVEONLY: SwiftAttrAttr {{.+}} <<invalid sloc>> "~Copyable" + +// CHECK-MOVEONLY-NEXT: ClassTemplateSpecializationDecl {{.+}} imported in Templates {{.+}} MoveOnly +// CHECK-MOVEONLY: SwiftAttrAttr {{.+}} <<invalid sloc>> "~Copyable" + +// Make sure the attributes aren't duplicated. +// CHECK-MOVEONLY-NOT: SwiftAttrAttr {{.+}} <<invalid sloc>> "~Copyable" _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
