mirror of
git://gcc.gnu.org/git/gcc.git
synced 2025-04-21 14:50:57 +08:00
re PR target/56184 (Internal compiler error in push_reload during bootstrap stage 2)
2013-02-13 Vladimir Makarov <vmakarov@redhat.com> PR target/56184 * ira.c (max_regno_before_ira): Move from ... (ira): ... here. (fix_reg_equiv_init): Use max_regno_before_ira instead of vec_safe_length. 2013-02-13 Vladimir Makarov <vmakarov@redhat.com> PR target/56184 * gcc.target/arm/pr56184.C: New test. From-SVN: r196019
This commit is contained in:
Vladimir Makarov
Vladimir Makarov
parent
6760071f30
commit
70cc328858
@ -1,3 +1,11 @@
|
||||
2013-02-13 Vladimir Makarov <vmakarov@redhat.com>
|
||||
|
||||
PR target/56184
|
||||
* ira.c (max_regno_before_ira): Move from ...
|
||||
(ira): ... here.
|
||||
(fix_reg_equiv_init): Use max_regno_before_ira instead of
|
||||
vec_safe_length.
|
||||
|
||||
2013-02-13 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
* config/i386/i386.c (ix86_asan_shadow_offset): Revert last change.
|
||||
@ -63,7 +71,7 @@
|
||||
|
||||
PR inline-asm/56148
|
||||
* lra-constraints.c (process_alt_operands): Match early clobber
|
||||
operand with itself. Check conflicts with earlyclobner only if
|
||||
operand with itself. Check conflicts with earlyclobber only if
|
||||
the operand is not reloaded. Prefer to reload conflicting operand
|
||||
if earlyclobber and matching operands are the same.
|
||||
|
||||
|
||||
11
gcc/ira.c
11
gcc/ira.c
@ -419,6 +419,11 @@ int ira_move_loops_num, ira_additional_jumps_num;
|
||||
|
||||
HARD_REG_SET eliminable_regset;
|
||||
|
||||
/* Value of max_reg_num () before IRA work start. This value helps
|
||||
us to recognize a situation when new pseudos were created during
|
||||
IRA work. */
|
||||
static int max_regno_before_ira;
|
||||
|
||||
/* Temporary hard reg set used for a different calculation. */
|
||||
static HARD_REG_SET temp_hard_regset;
|
||||
|
||||
@ -2264,11 +2269,11 @@ ira_update_equiv_info_by_shuffle_insn (int to_regno, int from_regno, rtx insns)
|
||||
static void
|
||||
fix_reg_equiv_init (void)
|
||||
{
|
||||
unsigned int max_regno = max_reg_num ();
|
||||
int max_regno = max_reg_num ();
|
||||
int i, new_regno, max;
|
||||
rtx x, prev, next, insn, set;
|
||||
|
||||
if (vec_safe_length (reg_equivs) < max_regno)
|
||||
if (max_regno_before_ira < max_regno)
|
||||
{
|
||||
max = vec_safe_length (reg_equivs);
|
||||
grow_reg_equivs ();
|
||||
@ -4350,7 +4355,7 @@ static void
|
||||
ira (FILE *f)
|
||||
{
|
||||
bool loops_p;
|
||||
int max_regno_before_ira, ira_max_point_before_emit;
|
||||
int ira_max_point_before_emit;
|
||||
int rebuild_p;
|
||||
bool saved_flag_caller_saves = flag_caller_saves;
|
||||
enum ira_region saved_flag_ira_region = flag_ira_region;
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
2013-02-13 Vladimir Makarov <vmakarov@redhat.com>
|
||||
|
||||
PR target/56184
|
||||
* gcc.target/arm/pr56184.C: New test.
|
||||
|
||||
2013-02-13 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
PR c++/56302
|
||||
|
||||
257
gcc/testsuite/gcc.target/arm/pr56184.C
Normal file
257
gcc/testsuite/gcc.target/arm/pr56184.C
Normal file
@ -0,0 +1,257 @@
|
||||
/* { dg-do compile } */
|
||||
/* { dg-options "-O2 -mthumb -march=armv7-a -mfpu=neon -mfloat-abi=softfp -mtune=cortex-a9 -fno-section-anchors" } */
|
||||
|
||||
typedef unsigned int size_t;
|
||||
__extension__ typedef int __intptr_t;
|
||||
typedef __intptr_t intptr_t;
|
||||
typedef union tree_node *tree;
|
||||
typedef const union tree_node *const_tree;
|
||||
extern void *ggc_internal_cleared_alloc_stat (size_t )
|
||||
__attribute__ ((__malloc__));
|
||||
enum tree_code {
|
||||
TREE_LIST=2,
|
||||
FUNCTION_DECL,
|
||||
MAX_TREE_CODES=254
|
||||
};
|
||||
extern unsigned char tree_contains_struct[MAX_TREE_CODES][64];
|
||||
struct tree_base {
|
||||
enum tree_code code : 16;
|
||||
};
|
||||
struct tree_common {
|
||||
tree chain;
|
||||
};
|
||||
enum tree_node_structure_enum {
|
||||
TS_COMMON,
|
||||
TS_DECL_COMMON,
|
||||
};
|
||||
extern void tree_contains_struct_check_failed (const_tree,
|
||||
const enum tree_node_structure_enum,
|
||||
const char *, int, const char *)
|
||||
__attribute__ ((__noreturn__));
|
||||
extern void tree_check_failed (const_tree, const char *, int, const char *,
|
||||
...) __attribute__ ((__noreturn__));
|
||||
struct tree_list {
|
||||
tree value;
|
||||
};
|
||||
struct tree_decl_common {
|
||||
tree initial;
|
||||
};
|
||||
struct tree_function_decl {
|
||||
struct function *f;
|
||||
};
|
||||
union
|
||||
tree_node {
|
||||
struct tree_base base;
|
||||
struct tree_common common;
|
||||
struct tree_decl_common decl_common;
|
||||
struct tree_function_decl function_decl;
|
||||
struct tree_list list;
|
||||
};
|
||||
inline tree
|
||||
tree_check (tree __t, const char *__f, int __l, const char *__g, enum tree_code __c)
|
||||
{
|
||||
if (((enum tree_code) (__t)->base.code) != __c)
|
||||
tree_check_failed (__t, __f, __l, __g, __c, 0);
|
||||
}
|
||||
inline tree
|
||||
contains_struct_check (tree __t, const enum tree_node_structure_enum __s,
|
||||
const char *__f, int __l, const char *__g)
|
||||
{
|
||||
if (tree_contains_struct[((enum tree_code) (__t)->base.code)][__s] != 1)
|
||||
tree_contains_struct_check_failed (__t, __s, __f, __l, __g);
|
||||
}
|
||||
struct function {
|
||||
tree static_chain_decl;
|
||||
};
|
||||
enum gimple_code {
|
||||
LAST_AND_UNUSED_GIMPLE_CODE
|
||||
};
|
||||
struct eh_catch_d
|
||||
{
|
||||
struct eh_catch_d *next_catch;
|
||||
struct eh_catch_d *prev_catch;
|
||||
tree type_list;
|
||||
tree filter_list;
|
||||
tree label;
|
||||
};
|
||||
struct eh_region_d
|
||||
{
|
||||
struct eh_region_d *outer;
|
||||
struct eh_region_d *inner;
|
||||
int index;
|
||||
union eh_region_u {
|
||||
struct eh_region_u_try {
|
||||
struct eh_catch_d *first_catch;
|
||||
} eh_try;
|
||||
} u;
|
||||
};
|
||||
typedef struct eh_catch_d *eh_catch;
|
||||
typedef struct eh_region_d *eh_region;
|
||||
extern void add_type_for_runtime (tree);
|
||||
enum LTO_tags
|
||||
{
|
||||
LTO_null = 0,
|
||||
LTO_bb0 = 1 + MAX_TREE_CODES + LAST_AND_UNUSED_GIMPLE_CODE,
|
||||
LTO_ert_cleanup,
|
||||
LTO_NUM_TAGS
|
||||
};
|
||||
enum lto_section_type
|
||||
{
|
||||
LTO_section_function_body,
|
||||
};
|
||||
struct lto_input_block
|
||||
{
|
||||
const char *data;
|
||||
unsigned int p;
|
||||
unsigned int len;
|
||||
};
|
||||
extern void lto_section_overrun (struct lto_input_block *) __attribute__ ((__noreturn__));
|
||||
extern void lto_value_range_error (const char *,
|
||||
long long, long long,
|
||||
long long) __attribute__ ((__noreturn__));
|
||||
long long streamer_read_hwi (struct lto_input_block *);
|
||||
static inline unsigned char
|
||||
streamer_read_uchar (struct lto_input_block *ib)
|
||||
{
|
||||
if (ib->p >= ib->len)
|
||||
lto_section_overrun (ib);
|
||||
return (ib->data[ib->p++]);
|
||||
}
|
||||
static inline long long
|
||||
streamer_read_hwi_in_range (struct lto_input_block *ib,
|
||||
const char *purpose,
|
||||
long long min,
|
||||
long long max)
|
||||
{
|
||||
long long range = max - min;
|
||||
long long val = streamer_read_uchar (ib);
|
||||
if (range >= 0xff)
|
||||
val |= ((long long)streamer_read_uchar (ib)) << 8;
|
||||
if (val < min || val > max)
|
||||
lto_value_range_error (purpose, val, min, max);
|
||||
return val;
|
||||
}
|
||||
static inline enum LTO_tags
|
||||
streamer_read_record_start (struct lto_input_block *ib)
|
||||
{
|
||||
return (enum LTO_tags)streamer_read_hwi_in_range ((ib), "LTO_tags", 0, (int)(LTO_NUM_TAGS) - 1);
|
||||
}
|
||||
struct streamer_hooks {
|
||||
tree (*read_tree) (struct lto_input_block *, struct data_in *);
|
||||
};
|
||||
extern struct streamer_hooks streamer_hooks;
|
||||
static struct eh_catch_d *
|
||||
lto_input_eh_catch_list (struct lto_input_block *ib, struct data_in *data_in,
|
||||
eh_catch *last_p)
|
||||
{
|
||||
eh_catch first;
|
||||
enum LTO_tags tag;
|
||||
*last_p = first = __null;
|
||||
tag = streamer_read_record_start (ib);
|
||||
while (tag)
|
||||
{
|
||||
tree list;
|
||||
eh_catch n;
|
||||
n = ((struct eh_catch_d *)(ggc_internal_cleared_alloc_stat (sizeof (struct eh_catch_d) )));
|
||||
n->type_list = streamer_hooks.read_tree(ib, data_in);
|
||||
n->filter_list = streamer_hooks.read_tree(ib, data_in);
|
||||
n->label = streamer_hooks.read_tree(ib, data_in);
|
||||
for (list = n->filter_list; list; list = ((contains_struct_check ((list), (TS_COMMON), "../../../gcc-4.8~svn195526/gcc/lto-streamer-in.c", 275, __FUNCTION__))->common.chain))
|
||||
add_type_for_runtime (((tree_check ((list), "../../../gcc-4.8~svn195526/gcc/lto-streamer-in.c", 276, __FUNCTION__, (TREE_LIST)))->list.value));
|
||||
if (*last_p)
|
||||
(*last_p)->next_catch = n;
|
||||
n->prev_catch = *last_p;
|
||||
*last_p = n;
|
||||
if (first == __null)
|
||||
first = n;
|
||||
tag = streamer_read_record_start (ib);
|
||||
}
|
||||
return first;
|
||||
}
|
||||
static eh_region
|
||||
input_eh_region (struct lto_input_block *ib, struct data_in *data_in, int ix)
|
||||
{
|
||||
enum LTO_tags tag;
|
||||
eh_region r;
|
||||
tag = streamer_read_record_start (ib);
|
||||
if (tag == LTO_null)
|
||||
return __null;
|
||||
r = ((struct eh_region_d *)(ggc_internal_cleared_alloc_stat (sizeof (struct eh_region_d) )));
|
||||
r->index = streamer_read_hwi (ib);
|
||||
r->outer = (eh_region) (intptr_t) streamer_read_hwi (ib);
|
||||
r->inner = (eh_region) (intptr_t) streamer_read_hwi (ib);
|
||||
switch (tag)
|
||||
{
|
||||
case LTO_ert_cleanup:
|
||||
{
|
||||
struct eh_catch_d *last_catch;
|
||||
r->u.eh_try.first_catch = lto_input_eh_catch_list (ib, data_in,
|
||||
&last_catch);
|
||||
}
|
||||
{
|
||||
tree l;
|
||||
add_type_for_runtime (((tree_check ((l), "../../../gcc-4.8~svn195526/gcc/lto-streamer-in.c", 346, __FUNCTION__, (TREE_LIST)))->list.value));
|
||||
}
|
||||
}
|
||||
}
|
||||
static void
|
||||
input_eh_regions (struct lto_input_block *ib, struct data_in *data_in,
|
||||
struct function *fn)
|
||||
{
|
||||
long long i, root_region, len;
|
||||
enum LTO_tags tag;
|
||||
tag = streamer_read_record_start (ib);
|
||||
if (tag == LTO_null)
|
||||
return;
|
||||
len = streamer_read_hwi (ib);
|
||||
if (len > 0)
|
||||
{
|
||||
for (i = 0; i < len; i++)
|
||||
{
|
||||
eh_region r = input_eh_region (ib, data_in, i);
|
||||
}
|
||||
}
|
||||
}
|
||||
static void
|
||||
input_ssa_names (struct lto_input_block *ib, struct data_in *data_in,
|
||||
struct function *fn)
|
||||
{
|
||||
unsigned int i, size;
|
||||
while (i)
|
||||
{
|
||||
}
|
||||
}
|
||||
static void
|
||||
input_struct_function_base (struct function *fn, struct data_in *data_in,
|
||||
struct lto_input_block *ib)
|
||||
{
|
||||
fn->static_chain_decl = streamer_hooks.read_tree(ib, data_in);
|
||||
}
|
||||
static void
|
||||
input_function (tree fn_decl, struct data_in *data_in,
|
||||
struct lto_input_block *ib)
|
||||
{
|
||||
struct function *fn;
|
||||
enum LTO_tags tag;
|
||||
fn = ((tree_check ((fn_decl), "../../../gcc-4.8~svn195526/gcc/lto-streamer-in.c", 807, __FUNCTION__, (FUNCTION_DECL)))->function_decl.f);
|
||||
tag = streamer_read_record_start (ib);
|
||||
input_struct_function_base (fn, data_in, ib);
|
||||
input_ssa_names (ib, data_in, fn);
|
||||
input_eh_regions (ib, data_in, fn);
|
||||
((contains_struct_check ((fn_decl), (TS_DECL_COMMON), "../../../gcc-4.8~svn195526/gcc/lto-streamer-in.c", 823, __FUNCTION__))->decl_common.initial) = streamer_hooks.read_tree(ib, data_in);
|
||||
}
|
||||
static void
|
||||
lto_read_body (struct lto_file_decl_data *file_data, tree fn_decl,
|
||||
const char *data, enum lto_section_type section_type)
|
||||
{
|
||||
struct data_in *data_in;
|
||||
struct lto_input_block ib_main;
|
||||
input_function (fn_decl, data_in, &ib_main);
|
||||
}
|
||||
void
|
||||
lto_input_function_body (struct lto_file_decl_data *file_data,
|
||||
tree fn_decl, const char *data)
|
||||
{
|
||||
lto_read_body (file_data, fn_decl, data, LTO_section_function_body);
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user