llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang-static-analyzer-1 Author: Sergej Salnikov (SergejSalnikov) <details> <summary>Changes</summary> Now the files location is used for macro expansions. This provides more accurate location when reporting compilation errors. Move from `getDecomposedExpansionLoc(Loc)` to `getDecomposedLoc(getFileLoc(Loc))` when computing Presumed location. (it's a rollforward of #<!-- -->166255 with fixed test) --- Full diff: https://github.com/llvm/llvm-project/pull/168402.diff 8 Files Affected: - (modified) clang/include/clang/Basic/SourceManager.h (+3-2) - (modified) clang/lib/Basic/SourceManager.cpp (+1-1) - (modified) clang/test/Analysis/plist-macros-with-expansion.cpp (+4-4) - (modified) clang/test/C/C23/n2350.c (+2-3) - (modified) clang/test/ExtractAPI/macro_undefined.c (+2-2) - (modified) clang/test/FixIt/format.cpp (+4-4) - (modified) clang/test/Preprocessor/macro_arg_directive.c (+2-2) - (modified) clang/test/Preprocessor/print_line_track.c (+5-6) ``````````diff diff --git a/clang/include/clang/Basic/SourceManager.h b/clang/include/clang/Basic/SourceManager.h index bc9e97863556d..f15257a760b8c 100644 --- a/clang/include/clang/Basic/SourceManager.h +++ b/clang/include/clang/Basic/SourceManager.h @@ -1464,8 +1464,9 @@ class SourceManager : public RefCountedBase<SourceManager> { /// directives. This provides a view on the data that a user should see /// in diagnostics, for example. /// - /// Note that a presumed location is always given as the expansion point of - /// an expansion location, not at the spelling location. + /// If \p Loc is a macro expansion location, the presumed location + /// computation uses the spelling location for macro arguments and the + /// expansion location for other macro expansions. /// /// \returns The presumed location of the specified SourceLocation. If the /// presumed location cannot be calculated (e.g., because \p Loc is invalid diff --git a/clang/lib/Basic/SourceManager.cpp b/clang/lib/Basic/SourceManager.cpp index b6cc6ec9365f5..767a765ae4261 100644 --- a/clang/lib/Basic/SourceManager.cpp +++ b/clang/lib/Basic/SourceManager.cpp @@ -1435,7 +1435,7 @@ PresumedLoc SourceManager::getPresumedLoc(SourceLocation Loc, if (Loc.isInvalid()) return PresumedLoc(); // Presumed locations are always for expansion points. - FileIDAndOffset LocInfo = getDecomposedExpansionLoc(Loc); + FileIDAndOffset LocInfo = getDecomposedLoc(getFileLoc(Loc)); bool Invalid = false; const SLocEntry &Entry = getSLocEntry(LocInfo.first, &Invalid); diff --git a/clang/test/Analysis/plist-macros-with-expansion.cpp b/clang/test/Analysis/plist-macros-with-expansion.cpp index d57bb0f2dd265..d9a2f94055593 100644 --- a/clang/test/Analysis/plist-macros-with-expansion.cpp +++ b/clang/test/Analysis/plist-macros-with-expansion.cpp @@ -405,14 +405,14 @@ void commaInBracketsTest() { code void commaInBracesTest() { - PASTE_CODE({ // expected-warning{{Dereference of null pointer}} + PASTE_CODE({ // NOTE: If we were to add a new variable here after a comma, we'd get a // compilation error, so this test is mainly here to show that this was also // investigated. // // int *ptr = nullptr, a; int *ptr = nullptr; - *ptr = 5; + *ptr = 5; // expected-warning{{Dereference of null pointer}} }) } @@ -425,14 +425,14 @@ void commaInBracesTest() { // CHECK-NEXT: <key>col</key><integer>3</integer> // CHECK-NEXT: <key>file</key><integer>0</integer> // CHECK-NEXT: </dict> -// CHECK-NEXT: <key>name</key><string>PASTE_CODE({ // expected- +// CHECK-NEXT: <key>name</key><string>PASTE_CODE({ // CHECK-NEXT: // NOTE: If we were to add a new variable here after a comma, we'd get a // CHECK-NEXT: // compilation error, so this test is mainly here to show that this was also // CHECK-NEXT: // investigated. // CHECK-NEXT: // // CHECK-NEXT: // int *ptr = nullptr, a; // CHECK-NEXT: int *ptr = nullptr; -// CHECK-NEXT: *ptr = 5; +// CHECK-NEXT: *ptr = 5; // expected- // CHECK-NEXT: })</string> // CHECK-NEXT: <key>expansion</key><string>{int *ptr =nullptr ;*ptr =5;}</string> // CHECK-NEXT: </dict> diff --git a/clang/test/C/C23/n2350.c b/clang/test/C/C23/n2350.c index af0ca6d79be5e..96b8c511d5716 100644 --- a/clang/test/C/C23/n2350.c +++ b/clang/test/C/C23/n2350.c @@ -47,11 +47,10 @@ int struct_in_second_param(void) { int macro(void) { return offsetof(struct A // cpp-error {{'A' cannot be defined in a type specifier}} \ - expected-warning 2 {{defining a type within 'offsetof' is a C23 extension}} + expected-warning {{defining a type within 'offsetof' is a C23 extension}} { int a; - struct B // verifier seems to think the error is emitted by the macro - // In fact the location of the error is "B" on the line above + struct B // expected-warning {{defining a type within 'offsetof' is a C23 extension}} { int c; int d; diff --git a/clang/test/ExtractAPI/macro_undefined.c b/clang/test/ExtractAPI/macro_undefined.c index 7bb50af380c24..1d697db1e1613 100644 --- a/clang/test/ExtractAPI/macro_undefined.c +++ b/clang/test/ExtractAPI/macro_undefined.c @@ -89,7 +89,7 @@ FUNC_GEN(bar, const int *, unsigned); }, "location": { "position": { - "character": 0, + "character": 9, "line": 2 }, "uri": "file://INPUT_DIR/input.h" @@ -241,7 +241,7 @@ FUNC_GEN(bar, const int *, unsigned); }, "location": { "position": { - "character": 0, + "character": 9, "line": 3 }, "uri": "file://INPUT_DIR/input.h" diff --git a/clang/test/FixIt/format.cpp b/clang/test/FixIt/format.cpp index d663c0fb35e13..db642b60ffd95 100644 --- a/clang/test/FixIt/format.cpp +++ b/clang/test/FixIt/format.cpp @@ -56,9 +56,9 @@ void a(N::E NEVal, S *SPtr, S &SRef) { // CHECK: fix-it:"{{.*}}":{[[@LINE-2]]:7-[[@LINE-2]]:7}:"static_cast<int>(" // CHECK: fix-it:"{{.*}}":{[[@LINE-3]]:17-[[@LINE-3]]:17}:")" - LOG( // expected-warning{{format specifies type 'int' but the argument has type 'N::E'}} + LOG( "%d", - SPtr->Type + SPtr->Type // expected-warning{{format specifies type 'int' but the argument has type 'N::E'}} ); // CHECK: fix-it:"{{.*}}":{[[@LINE-2]]:7-[[@LINE-2]]:7}:"static_cast<int>(" // CHECK: fix-it:"{{.*}}":{[[@LINE-3]]:17-[[@LINE-3]]:17}:")" @@ -68,8 +68,8 @@ void a(N::E NEVal, S *SPtr, S &SRef) { // CHECK: fix-it:"{{.*}}":{[[@LINE-1]]:7-[[@LINE-1]]:7}:"static_cast<int>(" // CHECK: fix-it:"{{.*}}":{[[@LINE-2]]:16-[[@LINE-2]]:16}:")" - LOG("%d", // expected-warning{{format specifies type 'int' but the argument has type 'N::E'}} - SRef.Type); + LOG("%d", + SRef.Type); // expected-warning{{format specifies type 'int' but the argument has type 'N::E'}} // CHECK: fix-it:"{{.*}}":{[[@LINE-1]]:7-[[@LINE-1]]:7}:"static_cast<int>(" // CHECK: fix-it:"{{.*}}":{[[@LINE-2]]:16-[[@LINE-2]]:16}:")" diff --git a/clang/test/Preprocessor/macro_arg_directive.c b/clang/test/Preprocessor/macro_arg_directive.c index 929a03d70d025..c612aa545a2a9 100644 --- a/clang/test/Preprocessor/macro_arg_directive.c +++ b/clang/test/Preprocessor/macro_arg_directive.c @@ -18,7 +18,7 @@ void fail(const char *); ({ int result = 0; __VA_ARGS__; if (!result) { fail(#__VA_ARGS__); }; result }) static inline int f(int k) { - return MUNCH( // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{returning 'void'}} expected-note {{expansion of macro 'MUNCH' requested here}} + return MUNCH( // expected-note {{to match this '('}} expected-error {{returning 'void'}} expected-note {{expansion of macro 'MUNCH' requested here}} if (k < 3) result = 24; else if (k > 4) @@ -27,6 +27,6 @@ static inline int f(int k) { #include "macro_arg_directive.h" // expected-error {{embedding a #include directive within macro arguments is not supported}} -int g(int k) { +int g(int k) { // expected-error {{expected ')'}} return f(k) + f(k-1)); } diff --git a/clang/test/Preprocessor/print_line_track.c b/clang/test/Preprocessor/print_line_track.c index 156ae22693b85..7df02c524a113 100644 --- a/clang/test/Preprocessor/print_line_track.c +++ b/clang/test/Preprocessor/print_line_track.c @@ -1,9 +1,9 @@ -/* RUN: %clang_cc1 -E %s | grep 'a 3' - * RUN: %clang_cc1 -E %s | grep 'b 16' - * RUN: %clang_cc1 -E -P %s | grep 'a 3' - * RUN: %clang_cc1 -E -P %s | grep 'b 16' +/* RUN: %clang_cc1 -E %s | awk '/a/,/3/{exit 0} {exit 1}' + * RUN: %clang_cc1 -E %s | awk '/b/,/16/{exit 0} {exit 1}' + * RUN: %clang_cc1 -E -P %s | awk '/a/,/3/{exit 0} {exit 1}' + * RUN: %clang_cc1 -E -P %s | awk '/b/,/16/{exit 0} {exit 1}' * RUN: %clang_cc1 -E %s | not grep '# 0 ' - * RUN: %clang_cc1 -E -P %s | count 2 + * RUN: %clang_cc1 -E -P %s | count 4 * PR1848 PR3437 PR7360 */ @@ -14,4 +14,3 @@ t(a t(b __LINE__) - `````````` </details> https://github.com/llvm/llvm-project/pull/168402 _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
