From: Jeffrey Yasskin Date: Tue, 20 Jul 2010 20:16:53 +0000 (+0000) Subject: re PR c++/44641 (Generated constructors and destructors get wrong debug location... X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0603fe683c89ccf3c1663817c44f0d320a57ba5e;p=gcc.git re PR c++/44641 (Generated constructors and destructors get wrong debug location when a typedef uses a forward declaration of the type before the definition) PR c++/44641 * gcc/cp/pt.c (instantiate_class_template): Propagate the template's location to its instance. * gcc/testsuite/lib/scanasm.exp (dg-function-on-line): Test that a function is defined on the current line. * gcc/testsuite/g++.dg/debug/dwarf2/lineno-simple1.C: New. Line number sanity test. * gcc/testsuite/g++.dg/debug/dwarf2/pr44641.C: New. From-SVN: r162349 --- diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 748f37df333..04f9af72d8f 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2010-07-20 Jeffrey Yasskin + + PR c++/44641 + * pt.c (instantiate_class_template): Propagate the template's + location to its instance. + 2010-07-20 Jason Merrill PR c++/44967 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index b61890737df..7a331479d8b 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -7832,7 +7832,8 @@ instantiate_class_template (tree type) /* Set the input location to the most specialized template definition. This is needed if tsubsting causes an error. */ typedecl = TYPE_MAIN_DECL (pattern); - input_location = DECL_SOURCE_LOCATION (typedecl); + input_location = DECL_SOURCE_LOCATION (TYPE_NAME (type)) = + DECL_SOURCE_LOCATION (typedecl); TYPE_HAS_USER_CONSTRUCTOR (type) = TYPE_HAS_USER_CONSTRUCTOR (pattern); TYPE_HAS_NEW_OPERATOR (type) = TYPE_HAS_NEW_OPERATOR (pattern); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9772252bc76..d5e18023f43 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2010-07-20 Jeffrey Yasskin + + * lib/scanasm.exp (dg-function-on-line): Test that a function is + defined on the current line. + * g++.dg/debug/dwarf2/lineno-simple1.C: New. Line number sanity test. + * g++.dg/debug/dwarf2/pr44641.C: New. + 2010-07-20 Nathan Froyd * gcc.target/powerpc/block-move-1.c: New test. diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/lineno-simple1.C b/gcc/testsuite/g++.dg/debug/dwarf2/lineno-simple1.C new file mode 100644 index 00000000000..e0ef7f71ca3 --- /dev/null +++ b/gcc/testsuite/g++.dg/debug/dwarf2/lineno-simple1.C @@ -0,0 +1,13 @@ +// { dg-do compile } +// { dg-options "-g -O0 -dA" } + +struct C { // { dg-function-on-line {_ZN1CC[12]Ev} } + virtual void + foo() {} // { dg-function-on-line _ZN1C3fooEv } +}; +static C dummy; + +int +main (void) +{ // { dg-function-on-line main } +} diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/pr44641.C b/gcc/testsuite/g++.dg/debug/dwarf2/pr44641.C new file mode 100644 index 00000000000..2df002f6b00 --- /dev/null +++ b/gcc/testsuite/g++.dg/debug/dwarf2/pr44641.C @@ -0,0 +1,41 @@ +// Origin: PR 44641 +// { dg-do compile } +// { dg-options "-g -O0 -dA" } + +template struct MisplacedDbg; +template struct MisplacedDbg; +struct Full; +template<> struct MisplacedDbg; + +struct Arg; +typedef MisplacedDbg Typedef1; +typedef MisplacedDbg Typedef2; +typedef MisplacedDbg Typedef3; + +template struct Base { + virtual ~Base() { + } +}; + +template <> +struct MisplacedDbg // { dg-function-on-line {_ZN12MisplacedDbgI4FullEC[12]Ev} } + // { dg-function-on-line {_ZN12MisplacedDbgI4FullED0Ev} { target *-*-* } 21 } + + : public Base { +}; + +template +struct MisplacedDbg // { dg-function-on-line {_ZN12MisplacedDbgIP3ArgEC[12]Ev} } + // { dg-function-on-line {_ZN12MisplacedDbgIP3ArgED0Ev} { target *-*-* } 28 } + : public Base { +}; + +template +struct MisplacedDbg // { dg-function-on-line {_ZN12MisplacedDbgI3ArgEC[12]Ev} } + // { dg-function-on-line {_ZN12MisplacedDbgI3ArgED0Ev} { target *-*-* } 34 } + : public Base { +}; + +static MisplacedDbg static_var1; +static MisplacedDbg static_var2; +static MisplacedDbg static_var3; diff --git a/gcc/testsuite/lib/scanasm.exp b/gcc/testsuite/lib/scanasm.exp index abc01b7cc55..aa8383d43a9 100644 --- a/gcc/testsuite/lib/scanasm.exp +++ b/gcc/testsuite/lib/scanasm.exp @@ -291,3 +291,40 @@ proc scan-assembler-dem-not { args } { fail "$testcase scan-assembler-dem-not $pp_pattern" } } + +# Utility for testing that a function is defined on the current line. +# Call pass if so, otherwise fail. Invoked directly; the file must +# have been compiled with -g -dA. +# +# Argument 0 is the current line, passed implicitly by dejagnu +# Argument 1 is the function to check +# Argument 2 handles expected failures and the like +# Argument 3 is "." to match the current line, or an integer to match +# an explicit line. +proc dg-function-on-line { args } { + # Upvar from dg-final: + upvar dg-final-code final-code + + set line [lindex $args 0] + set symbol [lindex $args 1] + set failures [lindex $args 2] + + if { [llength $args] >= 4 } { + switch [lindex $args 3] { + "." { } + "default" { set line [lindex $args 3] } + } + } + + set pattern [format {%s:[^\t]*(\t.file[^\t]*)?\t# \S*:%d\n} \ + $symbol $line] + + # The lack of spaces around $pattern is important, since they'd + # become part of the regex scan-assembler tries to match. + set cmd "scan-assembler {$pattern}" + if { [llength $args] >= 3 } { + set cmd "$cmd {$failures}" + } + + append final-code "$cmd\n" +}