On Tue, 2014-08-12 at 15:21 -0600, Jeff Law wrote: > On 08/06/14 11:19, David Malcolm wrote: > > For now, convert DEP_PRO and DEP_CON into functions. We will eventually > > change them back to macros once the relevant fields are of type > > rtx_insn *. > > > > gcc/ > > * sched-int.h (DEP_PRO): struct _dep's "pro" and "con" fields will > > eventually be rtx_insn *, but to help with transition, for now, > > convert from an access macro into a pair of functions: DEP_PRO > > returning an rtx_insn * and... > > (SET_DEP_PRO): New function, for use where DEP_PRO is used as an > > lvalue, returning an rtx&. > > (DEP_CON): Analogous changes to DEP_PRO above. > > (SET_DEP_CON): Likewise. > > > > * haifa-sched.c (create_check_block_twin): Replace DEP_CON used as > > an lvalue to SET_DEP_CON. > > * sched-deps.c (init_dep_1): Likewise for DEP_PRO and DEP_CON. > > (sd_copy_back_deps): Likewise for DEP_CON. > > (DEP_PRO): New function, adding a checked cast for now. > > (DEP_CON): Likewise. > > (SET_DEP_PRO): New function. > > (SET_DEP_CON): Likewise. > OK. Thanks. Fixed up the two as_a_nullable to safe_as_a, and committed to trunk as r214164, having verified bootstrap®rtest on x86_64-unknown-linux-gnu (Fedora 20) albeit in combination with patches 9-29 [1], and verified that it builds standalone with 9 targets. Am attaching what I committed. FWIW these function becomes macros again in patch #175.