From 548c7fb638fe0054f6c540639607b3c713d5d4b7 Mon Sep 17 00:00:00 2001 From: Alexander Ivchenko Date: Wed, 6 Aug 2014 16:05:57 +0400 Subject: [4.9] Backport of patch fixing PR61672. 2014-08-05 Richard Biener PR rtl-optimization/61672 * emit-rtl.h (mem_attrs_eq_p): Declare. * emit-rtl.c (mem_attrs_eq_p): Export. Handle NULL mem-attrs. * cse.c (exp_equiv_p): Use mem_attrs_eq_p. * cfgcleanup.c (merge_memattrs): Likewise. Include emit-rtl.h. Without this patch build of art with 4.9 is broken (at least on x86). Here is the error msg: art/runtime/interpreter/interpreter_goto_table_impl.cc:2437:1: error: the frame size of 3328 bytes is larger than 1728 bytes [-Werror=frame-larger-than=] Change-Id: I1a33cff567ae91bdbd34a4df6e6360594ae75993 Signed-off-by: Alexander Ivchenko --- gcc-4.9/gcc/emit-rtl.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gcc-4.9/gcc/emit-rtl.h') diff --git a/gcc-4.9/gcc/emit-rtl.h b/gcc-4.9/gcc/emit-rtl.h index fe68de947..36eb0c8b1 100644 --- a/gcc-4.9/gcc/emit-rtl.h +++ b/gcc-4.9/gcc/emit-rtl.h @@ -20,6 +20,9 @@ along with GCC; see the file COPYING3. If not see #ifndef GCC_EMIT_RTL_H #define GCC_EMIT_RTL_H +/* Return whether two MEM_ATTRs are equal. */ +bool mem_attrs_eq_p (const struct mem_attrs *, const struct mem_attrs *); + /* Set the alias set of MEM to SET. */ extern void set_mem_alias_set (rtx, alias_set_type); -- cgit v1.2.3