aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPranil Dey <mkdeyp@gmail.com>2024-10-01 10:00:26 +0530
committerPranil Dey <mkdeyp@gmail.com>2024-10-01 10:00:26 +0530
commit6db81730ef66c0f557b78c9a67a33b6eec2f040e (patch)
treef69c5b96f2fb64bceed0ac9b32f8536cdcc8621f
parent079ca47d41e5030c63cca7f8ee679e7323a26d45 (diff)
parentb602de4ed9f872aa2a07e8cf74d5b3c8446de221 (diff)
downloadgcc-6db81730ef66c0f557b78c9a67a33b6eec2f040e.zip
gcc-6db81730ef66c0f557b78c9a67a33b6eec2f040e.tar.gz
gcc-6db81730ef66c0f557b78c9a67a33b6eec2f040e.tar.bz2
Merge remote-tracking branch 'origin/devel/nothrow-detection' into devel/nothrow-detection
-rw-r--r--gcc/ipa-devirt.cc4
-rw-r--r--gcc/tree-eh.h3
2 files changed, 5 insertions, 2 deletions
diff --git a/gcc/ipa-devirt.cc b/gcc/ipa-devirt.cc
index 17271b0..d6cfcf2 100644
--- a/gcc/ipa-devirt.cc
+++ b/gcc/ipa-devirt.cc
@@ -1219,12 +1219,12 @@ odr_equivalent_or_derived_p (tree t1, tree t2)
if (in_lto_p)
{
if (odr_types_equivalent_p (t1, t2))
- return true;
+ return true;
}
else
{
if (TYPE_MAIN_VARIANT (t1) == TYPE_MAIN_VARIANT (t2))
- return true;
+ return true;
}
if (!TYPE_BINFO (t2))
return false;
diff --git a/gcc/tree-eh.h b/gcc/tree-eh.h
index 4d816fd..4fa134b 100644
--- a/gcc/tree-eh.h
+++ b/gcc/tree-eh.h
@@ -23,6 +23,7 @@ along with GCC; see the file COPYING3. If not see
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 +34,8 @@ extern int lookup_stmt_eh_lp (const gimple *);
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);