From 5570ddd5a8ce2125c8290598037a40481f193197 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Mon, 11 May 2015 16:33:07 -0700 Subject: [PATCH] Only resolve_asm_operand_names once We do it in the front end already; no need to repeat. From-SVN: r223022 --- gcc/ChangeLog | 6 ++++++ gcc/cfgexpand.c | 2 -- gcc/stmt.c | 7 ++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d7d5ca01cfe..98394eee61b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2015-05-11 Richard Henderson + + * cfgexpand.c (expand_asm_operands): Don't call + resolve_asm_operand_names. + * stmt.c (resolve_asm_operand_names): Clarify block comment. + 2015-05-11 Jan Hubicka * dwarf2out.c (gen_member_die): Sanity check that we access diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c index b76a219c4f4..69d00a00095 100644 --- a/gcc/cfgexpand.c +++ b/gcc/cfgexpand.c @@ -2554,8 +2554,6 @@ expand_asm_operands (tree string, tree outputs, tree inputs, if (! check_operand_nalternatives (outputs, inputs)) return; - string = resolve_asm_operand_names (string, outputs, inputs, labels); - /* Collect constraints. */ i = 0; for (t = outputs; t ; t = TREE_CHAIN (t), i++) diff --git a/gcc/stmt.c b/gcc/stmt.c index 6c62a129601..e63179f9776 100644 --- a/gcc/stmt.c +++ b/gcc/stmt.c @@ -562,9 +562,10 @@ check_unique_operand_names (tree outputs, tree inputs, tree labels) return false; } -/* A subroutine of expand_asm_operands. Resolve the names of the operands - in *POUTPUTS and *PINPUTS to numbers, and replace the name expansions in - STRING and in the constraints to those numbers. */ +/* Resolve the names of the operands in *POUTPUTS and *PINPUTS to numbers, + and replace the name expansions in STRING and in the constraints to + those numbers. This is generally done in the front end while creating + the ASM_EXPR generic tree that eventually becomes the GIMPLE_ASM. */ tree resolve_asm_operand_names (tree string, tree outputs, tree inputs, tree labels) -- 2.30.2