Include leading attributes in DeclStmt's SourceRange
Differential Revision: https://reviews.llvm.org/D68581
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@375104 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Parse/ParseStmt.cpp b/lib/Parse/ParseStmt.cpp
index 3bfe4a7..727ab75 100644
--- a/lib/Parse/ParseStmt.cpp
+++ b/lib/Parse/ParseStmt.cpp
@@ -220,6 +220,8 @@
Decl =
ParseDeclaration(DeclaratorContext::BlockContext, DeclEnd, Attrs);
}
+ if (Attrs.Range.getBegin().isValid())
+ DeclStart = Attrs.Range.getBegin();
return Actions.ActOnDeclStmt(Decl, DeclStart, DeclEnd);
}
diff --git a/test/AST/sourceranges.cpp b/test/AST/sourceranges.cpp
index 53f2f57..3c023c8 100644
--- a/test/AST/sourceranges.cpp
+++ b/test/AST/sourceranges.cpp
@@ -92,6 +92,22 @@
}; // namespace std
+// CHECK: NamespaceDecl {{.*}} attributed_decl
+namespace attributed_decl {
+ void f() {
+ // CHECK: DeclStmt {{.*}} <line:[[@LINE+1]]:5, col:28>
+ [[maybe_unused]] int i1;
+ // CHECK: DeclStmt {{.*}} <line:[[@LINE+1]]:5, col:35>
+ __attribute__((unused)) int i2;
+ // CHECK: DeclStmt {{.*}} <line:[[@LINE+1]]:5, col:35>
+ int __attribute__((unused)) i3;
+ // CHECK: DeclStmt {{.*}} <<built-in>:{{.*}}, {{.*}}:[[@LINE+1]]:40>
+ __declspec(dllexport) extern int i4;
+ // CHECK: DeclStmt {{.*}} <line:[[@LINE+1]]:5, col:40>
+ extern int __declspec(dllexport) i5;
+ }
+}
+
#if __cplusplus >= 201703L
// CHECK-1Z: FunctionDecl {{.*}} construct_with_init_list
std::map<int, int> construct_with_init_list() {
