From 19f8b22971b1aeaa929eb3e3834cc24da1932f12 Mon Sep 17 00:00:00 2001 From: Trevor Saunders Date: Wed, 3 Sep 2014 00:52:11 +0000 Subject: use rtx_code_label more gcc/ * asan.c, cfgexpand.c, config/alpha/alpha.md, config/arm/arm.c, config/epiphany/epiphany.md, config/h8300/h8300.c, config/i386/i386.md, config/m32r/m32r.c, config/mcore/mcore.md, config/mips/mips.c, config/mips/mips.md, config/nios2/nios2.c, config/pa/pa.c, config/s390/s390.c, config/s390/s390.md, config/sh/sh-mem.cc, config/sh/sh.c, config/sparc/sparc.c, dojump.c, function.c, optabs.c, stmt.c: Assign the result of gen_label_rtx to rtx_code_label * instead of rtx. From-SVN: r214841 --- gcc/asan.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gcc/asan.c') diff --git a/gcc/asan.c b/gcc/asan.c index 4ed9344..cf5de27 100644 --- a/gcc/asan.c +++ b/gcc/asan.c @@ -983,7 +983,8 @@ rtx_insn * asan_emit_stack_protection (rtx base, rtx pbase, unsigned int alignb, HOST_WIDE_INT *offsets, tree *decls, int length) { - rtx shadow_base, shadow_mem, ret, mem, orig_base, lab; + rtx shadow_base, shadow_mem, ret, mem, orig_base; + rtx_code_label *lab; rtx_insn *insns; char buf[30]; unsigned char shadow_bytes[4]; @@ -1174,10 +1175,10 @@ asan_emit_stack_protection (rtx base, rtx pbase, unsigned int alignb, /* Construct epilogue sequence. */ start_sequence (); - lab = NULL_RTX; + lab = NULL; if (use_after_return_class != -1) { - rtx lab2 = gen_label_rtx (); + rtx_code_label *lab2 = gen_label_rtx (); char c = (char) ASAN_STACK_MAGIC_USE_AFTER_RET; int very_likely = REG_BR_PROB_BASE - (REG_BR_PROB_BASE / 2000 - 1); emit_cmp_and_jump_insns (orig_base, base, EQ, NULL_RTX, -- cgit v1.1