===================================================================
@@ -5030,7 +5030,7 @@ store_expr (tree exp, rtx target, int ca
{
rtx temp;
rtx alt_rtl = NULL_RTX;
- location_t loc = EXPR_LOCATION (exp);
+ location_t loc = curr_insn_location ();
if (VOID_TYPE_P (TREE_TYPE (exp)))
{
@@ -7881,7 +7881,7 @@ expand_expr_real (tree exp, rtx target,
{
location_t saved_location = input_location;
location_t saved_curr_loc = curr_insn_location ();
- input_location = EXPR_LOCATION (exp);
+ input_location = curr_insn_location ();
set_curr_insn_location (input_location);
ret = expand_expr_real_1 (exp, target, tmode, modifier, alt_rtl);
@@ -9120,7 +9120,7 @@ expand_expr_real_1 (tree exp, rtx target
int ignore;
tree context;
bool reduce_bit_field;
- location_t loc = EXPR_LOCATION (exp);
+ location_t loc = curr_insn_location ();
struct separate_ops ops;
tree treeop0, treeop1, treeop2;
tree ssa_name = NULL_TREE;
@@ -9481,7 +9481,7 @@ expand_expr_real_1 (tree exp, rtx target
with non-BLKmode values. */
gcc_assert (GET_MODE (ret) != BLKmode);
- val = build_decl (EXPR_LOCATION (exp),
+ val = build_decl (curr_insn_location (),
VAR_DECL, NULL, TREE_TYPE (exp));
DECL_ARTIFICIAL (val) = 1;
DECL_IGNORED_P (val) = 1;