gargvaibhav64 updated this revision to Diff 277022.
gargvaibhav64 marked 3 inline comments as done.
gargvaibhav64 added a comment.
Incorporated the changes
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D83174/new/
https://reviews.llvm.org/D83174
Files:
clang/lib/Serialization/ASTReaderDecl.cpp
clang/test/Modules/Inputs/inherit-attribute/a.h
clang/test/Modules/Inputs/inherit-attribute/b.h
clang/test/Modules/Inputs/inherit-attribute/c.h
clang/test/Modules/Inputs/inherit-attribute/module.modulemap
clang/test/Modules/inherit-attribute.cpp
Index: clang/test/Modules/inherit-attribute.cpp
===================================================================
--- /dev/null
+++ clang/test/Modules/inherit-attribute.cpp
@@ -0,0 +1,10 @@
+// RUN: rm -rf %t
+// RUN: %clang_cc1 -fmodules -ast-dump -I%S/Inputs/inherit-attribute -fmodules-cache-path=%t -fimplicit-module-maps -verify %s -fmodules-local-submodule-visibility
+
+#include "b.h"
+#include "c.h"
+
+class Foo;
+
+Foo f;
+// expected-no-diagnostics
Index: clang/test/Modules/Inputs/inherit-attribute/module.modulemap
===================================================================
--- /dev/null
+++ clang/test/Modules/Inputs/inherit-attribute/module.modulemap
@@ -0,0 +1,3 @@
+module "b" { header "b.h" }
+
+module "c" { header "c.h" }
Index: clang/test/Modules/Inputs/inherit-attribute/c.h
===================================================================
--- /dev/null
+++ clang/test/Modules/Inputs/inherit-attribute/c.h
@@ -0,0 +1,7 @@
+#include "a.h"
+
+class Foo;
+class C {
+public:
+ C();
+};
Index: clang/test/Modules/Inputs/inherit-attribute/b.h
===================================================================
--- /dev/null
+++ clang/test/Modules/Inputs/inherit-attribute/b.h
@@ -0,0 +1,12 @@
+#include "a.h"
+
+class Foo;
+
+void bar() {
+ &Foo::step;
+}
+
+class B {
+public:
+ B();
+};
Index: clang/test/Modules/Inputs/inherit-attribute/a.h
===================================================================
--- /dev/null
+++ clang/test/Modules/Inputs/inherit-attribute/a.h
@@ -0,0 +1,10 @@
+#ifndef FOO
+#define FOO
+
+class Foo {
+public:
+ void step(int v);
+ Foo();
+};
+
+#endif
Index: clang/lib/Serialization/ASTReaderDecl.cpp
===================================================================
--- clang/lib/Serialization/ASTReaderDecl.cpp
+++ clang/lib/Serialization/ASTReaderDecl.cpp
@@ -281,6 +281,9 @@
static Decl *getMostRecentDeclImpl(...);
static Decl *getMostRecentDecl(Decl *D);
+ static void mergeInheritableAttributes(ASTReader &Reader, Decl *D,
+ Decl *Previous);
+
template <typename DeclT>
static void attachPreviousDeclImpl(ASTReader &Reader,
Redeclarable<DeclT> *D, Decl *Previous,
@@ -3531,6 +3534,19 @@
return ASTDeclReader::getMostRecentDecl(D->getCanonicalDecl());
}
+void ASTDeclReader::mergeInheritableAttributes(ASTReader &Reader, Decl *D,
+ Decl *Previous) {
+ InheritableAttr *NewAttr = nullptr;
+ ASTContext &Context = Reader.getContext();
+ const auto *IA = Previous->getAttr<MSInheritanceAttr>();
+
+ if (IA && Previous->hasAttr<MSInheritanceAttr>()) {
+ NewAttr = cast<InheritableAttr>(IA->clone(Context));
+ NewAttr->setInherited(true);
+ D->addAttr(NewAttr);
+ }
+}
+
template<typename DeclT>
void ASTDeclReader::attachPreviousDeclImpl(ASTReader &Reader,
Redeclarable<DeclT> *D,
@@ -3689,6 +3705,12 @@
if (auto *TD = dyn_cast<TemplateDecl>(D))
inheritDefaultTemplateArguments(Reader.getContext(),
cast<TemplateDecl>(Previous), TD);
+
+ // If any of the declaration in the chain contains an Inheritable attribute,
+ // it needs to be added to all the declarations in the redeclarable chain.
+ // FIXME: Only the logic of merging MSInheritableAttr is present, it should
+ // be extended for all inheritable attributes.
+ mergeInheritableAttributes(Reader, D, Previous);
}
template<typename DeclT>
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
