From 131263fa870bf2cacf555a7b123032338da9477f Mon Sep 17 00:00:00 2001 From: Andrew Pinski Date: Fri, 8 Oct 2004 02:46:00 +0000 Subject: [PATCH] pt.c (tsubst_expr): Look passed the CLEANUP_POINT_EXPR to get the asm expression. 2004-10-07 Andrew Pinski * pt.c (tsubst_expr) : Look passed the CLEANUP_POINT_EXPR to get the asm expression. From-SVN: r88733 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/pt.c | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 8b104c76346..df14e9c26e9 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2004-10-07 Andrew Pinski + + * pt.c (tsubst_expr) : Look passed the + CLEANUP_POINT_EXPR to get the asm expression. + 2004-10-07 Mark Mitchell * cp-tree.h (ICS_USER_FLAG): Remove comment about obsolete flag. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 0d24d06869a..bb3b78ab830 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -8058,7 +8058,12 @@ tsubst_expr (tree t, tree args, tsubst_flags_t complain, tree in_decl) tsubst_expr (ASM_OUTPUTS (t), args, complain, in_decl), tsubst_expr (ASM_INPUTS (t), args, complain, in_decl), tsubst_expr (ASM_CLOBBERS (t), args, complain, in_decl)); - ASM_INPUT_P (tmp) = ASM_INPUT_P (t); + { + tree asm_expr = tmp; + if (TREE_CODE (asm_expr) == CLEANUP_POINT_EXPR) + asm_expr = TREE_OPERAND (asm_expr, 0); + ASM_INPUT_P (asm_expr) = ASM_INPUT_P (t); + } break; case TRY_BLOCK: -- 2.30.2