diff options
| -rw-r--r-- | clang/lib/Parse/ParseCXXInlineMethods.cpp | 7 | ||||
| -rw-r--r-- | clang/test/Analysis/inlining/path-notes.cpp | 10 | ||||
| -rw-r--r-- | clang/test/Misc/ast-dump-decl.cpp | 13 | ||||
| -rw-r--r-- | clang/unittests/AST/SourceLocationTest.cpp | 12 |
4 files changed, 30 insertions, 12 deletions
diff --git a/clang/lib/Parse/ParseCXXInlineMethods.cpp b/clang/lib/Parse/ParseCXXInlineMethods.cpp index 86ac471ddb1..cd438f7437d 100644 --- a/clang/lib/Parse/ParseCXXInlineMethods.cpp +++ b/clang/lib/Parse/ParseCXXInlineMethods.cpp @@ -71,17 +71,24 @@ NamedDecl *Parser::ParseCXXInlineMethodDef(AccessSpecifier AS, bool Delete = false; SourceLocation KWLoc; + SourceLocation KWEndLoc = Tok.getEndLoc().getLocWithOffset(-1); if (TryConsumeToken(tok::kw_delete, KWLoc)) { Diag(KWLoc, getLangOpts().CPlusPlus11 ? diag::warn_cxx98_compat_deleted_function : diag::ext_deleted_function); Actions.SetDeclDeleted(FnD, KWLoc); Delete = true; + if (auto *DeclAsFunction = dyn_cast<FunctionDecl>(FnD)) { + DeclAsFunction->setRangeEnd(KWEndLoc); + } } else if (TryConsumeToken(tok::kw_default, KWLoc)) { Diag(KWLoc, getLangOpts().CPlusPlus11 ? diag::warn_cxx98_compat_defaulted_function : diag::ext_defaulted_function); Actions.SetDeclDefaulted(FnD, KWLoc); + if (auto *DeclAsFunction = dyn_cast<FunctionDecl>(FnD)) { + DeclAsFunction->setRangeEnd(KWEndLoc); + } } else { llvm_unreachable("function definition after = not 'delete' or 'default'"); } diff --git a/clang/test/Analysis/inlining/path-notes.cpp b/clang/test/Analysis/inlining/path-notes.cpp index 30ce8c8c6e5..30725115c2a 100644 --- a/clang/test/Analysis/inlining/path-notes.cpp +++ b/clang/test/Analysis/inlining/path-notes.cpp @@ -2458,12 +2458,12 @@ namespace PR17746 { // CHECK-NEXT: <array> // CHECK-NEXT: <dict> // CHECK-NEXT: <key>line</key><integer>105</integer> -// CHECK-NEXT: <key>col</key><integer>53</integer> +// CHECK-NEXT: <key>col</key><integer>63</integer> // CHECK-NEXT: <key>file</key><integer>0</integer> // CHECK-NEXT: </dict> // CHECK-NEXT: <dict> // CHECK-NEXT: <key>line</key><integer>105</integer> -// CHECK-NEXT: <key>col</key><integer>53</integer> +// CHECK-NEXT: <key>col</key><integer>63</integer> // CHECK-NEXT: <key>file</key><integer>0</integer> // CHECK-NEXT: </dict> // CHECK-NEXT: </array> @@ -2475,7 +2475,7 @@ namespace PR17746 { // CHECK-NEXT: <key>location</key> // CHECK-NEXT: <dict> // CHECK-NEXT: <key>line</key><integer>105</integer> -// CHECK-NEXT: <key>col</key><integer>53</integer> +// CHECK-NEXT: <key>col</key><integer>63</integer> // CHECK-NEXT: <key>file</key><integer>0</integer> // CHECK-NEXT: </dict> // CHECK-NEXT: <key>ranges</key> @@ -2483,12 +2483,12 @@ namespace PR17746 { // CHECK-NEXT: <array> // CHECK-NEXT: <dict> // CHECK-NEXT: <key>line</key><integer>105</integer> -// CHECK-NEXT: <key>col</key><integer>53</integer> +// CHECK-NEXT: <key>col</key><integer>63</integer> // CHECK-NEXT: <key>file</key><integer>0</integer> // CHECK-NEXT: </dict> // CHECK-NEXT: <dict> // CHECK-NEXT: <key>line</key><integer>105</integer> -// CHECK-NEXT: <key>col</key><integer>53</integer> +// CHECK-NEXT: <key>col</key><integer>63</integer> // CHECK-NEXT: <key>file</key><integer>0</integer> // CHECK-NEXT: </dict> // CHECK-NEXT: </array> diff --git a/clang/test/Misc/ast-dump-decl.cpp b/clang/test/Misc/ast-dump-decl.cpp index fe7ea7503df..9e94a308194 100644 --- a/clang/test/Misc/ast-dump-decl.cpp +++ b/clang/test/Misc/ast-dump-decl.cpp @@ -139,7 +139,6 @@ class TestCXXDestructorDecl { // CHECK-NEXT: CompoundStmt // Test that the range of a defaulted members is computed correctly. -// FIXME: This should include the "= default". class TestMemberRanges { public: TestMemberRanges() = default; @@ -156,12 +155,12 @@ void SomeFunction() { A = static_cast<TestMemberRanges &&>(B); TestMemberRanges C(static_cast<TestMemberRanges &&>(A)); } -// CHECK: CXXConstructorDecl{{.*}} <line:{{.*}}:3, col:20> -// CHECK: CXXConstructorDecl{{.*}} <line:{{.*}}:3, col:49> -// CHECK: CXXConstructorDecl{{.*}} <line:{{.*}}:3, col:44> -// CHECK: CXXDestructorDecl{{.*}} <line:{{.*}}:3, col:21> -// CHECK: CXXMethodDecl{{.*}} <line:{{.*}}:3, col:60> -// CHECK: CXXMethodDecl{{.*}} <line:{{.*}}:3, col:55> +// CHECK: CXXConstructorDecl{{.*}} <line:{{.*}}:3, col:30> +// CHECK: CXXConstructorDecl{{.*}} <line:{{.*}}:3, col:59> +// CHECK: CXXConstructorDecl{{.*}} <line:{{.*}}:3, col:54> +// CHECK: CXXDestructorDecl{{.*}} <line:{{.*}}:3, col:31> +// CHECK: CXXMethodDecl{{.*}} <line:{{.*}}:3, col:70> +// CHECK: CXXMethodDecl{{.*}} <line:{{.*}}:3, col:65> class TestCXXConversionDecl { operator int() { return 0; } diff --git a/clang/unittests/AST/SourceLocationTest.cpp b/clang/unittests/AST/SourceLocationTest.cpp index ca5a8892a58..98460d959c3 100644 --- a/clang/unittests/AST/SourceLocationTest.cpp +++ b/clang/unittests/AST/SourceLocationTest.cpp @@ -122,6 +122,18 @@ TEST(CXXConstructorDecl, NoRetFunTypeLocRange) { EXPECT_TRUE(Verifier.match("class C { C(); };", functionDecl())); } +TEST(CXXConstructorDecl, DefaultedCtorLocRange) { + RangeVerifier<CXXConstructorDecl> Verifier; + Verifier.expectRange(1, 11, 1, 23); + EXPECT_TRUE(Verifier.match("class C { C() = default; };", functionDecl())); +} + +TEST(CXXConstructorDecl, DeletedCtorLocRange) { + RangeVerifier<CXXConstructorDecl> Verifier; + Verifier.expectRange(1, 11, 1, 22); + EXPECT_TRUE(Verifier.match("class C { C() = delete; };", functionDecl())); +} + TEST(CompoundLiteralExpr, CompoundVectorLiteralRange) { RangeVerifier<CompoundLiteralExpr> Verifier; Verifier.expectRange(2, 11, 2, 22); |
