aboutsummaryrefslogtreecommitdiff
path: root/libcpp
diff options
context:
space:
mode:
authorDodji Seketeli <dodji@redhat.com>2012-04-30 11:43:02 +0000
committerDodji Seketeli <dodji@gcc.gnu.org>2012-04-30 13:43:02 +0200
commitbfd93a72d259d4f372846f6f9ad6adbf4bb7f367 (patch)
tree0b68390326b658c1ca86316a8dc1f8b29617d095 /libcpp
parente42d063054571ac6678f5799c3d4fe890ecc9a84 (diff)
downloadgcc-bfd93a72d259d4f372846f6f9ad6adbf4bb7f367.zip
gcc-bfd93a72d259d4f372846f6f9ad6adbf4bb7f367.tar.gz
gcc-bfd93a72d259d4f372846f6f9ad6adbf4bb7f367.tar.bz2
Fix location for static class members
Consider the test case g++.dg/other/offsetof5.C: #include <stddef.h> struct A { char c; int &i; }; int j = offsetof (A, i); // { dg-warning "invalid access|offsetof" } template <typename T> struct S { T h; T &i; static const int j = offsetof (S, i); // { dg-warning "invalid access|offsetof" } }; int k = S<int>::j; // { dg-message "required from here" } The second warning (that involves the instantiation of the S template) is not emitted when -ftrack-macro-expansion is on. This is because during the instantiation of the member j of S template, the location that is used for the warning is the one for the DECL j (set by instantiate_decl). And that location is inaccurately set to the locus of 'offsetof', which is a macro defined in a system header, so it's discarded by the diagnostics machinery. Note that when we reach the point where we emit the warning in build_class_member_access_expr offsetof expression has long been folded, so we cannot use e.g, the location of the ')' token that would have been in the source code. So I believe the location of 'j' is the best we can get at this point. The patch below sets the location of the DECL for 'j' to what I believe is its precise location; with that, the test case passes with and without -ftrack-macro-expansion. But I had to adjust g++.dg/template/sfinae6_neg.C for that. Tested on x86_64-unknown-linux-gnu against trunk. gcc/cp * decl.c (grokdeclarator): Use the location carried by the declarator for the DECL of the static class member. gcc/testsuite/ * g++.dg/template/sfinae6_neg.C: Adjust. From-SVN: r186974
Diffstat (limited to 'libcpp')
0 files changed, 0 insertions, 0 deletions