Merge remote-tracking branch 'origin/devel/nothrow-detection' into devel/nothrow...

diff --cc gcc/tree-eh.h
index 4d816fd93c85428904e83899b39289c86abeec62,f3b2c16ed77e18ae0d45d31914bc6b7d2f08b45a..4fa134b43ddc04d0cdd817317000850012de4512
--- 1/gcc/tree-eh.h
--- 2/gcc/tree-eh.h
+++ b/gcc/tree-eh.h
@@@ -23,6 -23,6 +23,7 @@@ along with GCC; see the file COPYING3
  
  typedef struct eh_region_d *eh_region;
  typedef struct eh_landing_pad_d *eh_landing_pad;
++typedef struct eh_landing_pad_d *eh_landing_pad;
  
  extern void using_eh_for_cleanups (void);
  extern void add_stmt_to_eh_lp (gimple *, int);
@@@ -33,6 -33,6 +34,8 @@@ extern int lookup_stmt_eh_lp (const gim
  extern bool make_eh_dispatch_edges (geh_dispatch *);
  extern bool match_lp (eh_landing_pad, vec<tree> *);
  extern void update_stmt_eh_region(gimple *);
++extern bool match_lp (eh_landing_pad, vec<tree> *);
++extern void update_stmt_eh_region(gimple *);
  extern edge make_eh_edge (gimple *);
  extern edge redirect_eh_edge (edge, basic_block);
  extern void redirect_eh_dispatch_edge (geh_dispatch *, edge, basic_block);