On Thu, Sep 20, 2012 at 7:31 PM, Dehao Chen <de...@google.com> wrote: > This patch fixes http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54649 > > The previous patch is incorrect and will cause regression to > g++.dg/debug/dwarf2/deallocator.C > > A new patch is attached. It solved the bootstrap problem for go. > Basically, when we set the line number for stmts in the finally block, > we don't want to change its block info. > > The new patch can bootstrap, and passed gcc regression tests. > > Is it okay for trunk? > > Thanks, > Dehao > > gcc/ChangeLog: > 2012-09-20 Dehao Chen <de...@google.com> > > PR go/54649 > * tree-eh.c (lower_try_finally_dup_block): Set the correct block for > stmts in the duplicated EH block.
This is OK. Please also add the test case from http://gcc.gnu.org/ml/gcc/2012-09/msg00183.html to the compiler testsuite. Best would be to add a simplified version that does not #include <string>. But I see that there are test cases under testsuite/g++.dg that #include <string>, so I guess it is OK to do that in a g++ test. You can add the test case, however you decided to do, in a separate, later patch. Thanks. Ian