diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2012-02-14 20:51:01 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2012-02-14 20:51:01 +0100 |
| commit | 61c8513078d1ef99c98aee7f53750f6e356a56d3 (patch) | |
| tree | 7d7f339c1b7acf2718543dccd602e6bcd16acf33 | |
| parent | 72824d5e40692acaba4e7635b0b26f2e8e48b059 (diff) | |
| download | gcc-61c8513078d1ef99c98aee7f53750f6e356a56d3.zip gcc-61c8513078d1ef99c98aee7f53750f6e356a56d3.tar.gz gcc-61c8513078d1ef99c98aee7f53750f6e356a56d3.tar.bz2 | |
re PR c++/52247 (ICE with asm goto)
PR c++/52247
* pt.c (tsubst_copy_asm_operands): For LABEL_DECL values call
lookup_label on label's name and set TREE_USED.
* g++.dg/template/asmgoto1.C: New test.
From-SVN: r184229
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 13 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/asmgoto1.C | 18 |
4 files changed, 40 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index c20077c..f7cafec 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2012-02-14 Jakub Jelinek <jakub@redhat.com> + + PR c++/52247 + * pt.c (tsubst_copy_asm_operands): For LABEL_DECL values call + lookup_label on label's name and set TREE_USED. + 2012-02-14 Jason Merrill <jason@redhat.com> PR c++/39055 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index a0b2a0b..c9cd953 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -12612,8 +12612,17 @@ tsubst_copy_asm_operands (tree t, tree args, tsubst_flags_t complain, if (purpose) purpose = RECUR (purpose); value = TREE_VALUE (t); - if (value && TREE_CODE (value) != LABEL_DECL) - value = RECUR (value); + if (value) + { + if (TREE_CODE (value) != LABEL_DECL) + value = RECUR (value); + else + { + value = lookup_label (DECL_NAME (value)); + gcc_assert (TREE_CODE (value) == LABEL_DECL); + TREE_USED (value) = 1; + } + } chain = TREE_CHAIN (t); if (chain && chain != void_type_node) chain = RECUR (chain); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 67c9274..d82d7d5 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2012-02-14 Jakub Jelinek <jakub@redhat.com> + + PR c++/52247 + * g++.dg/template/asmgoto1.C: New test. + 2012-02-14 Ian Lance Taylor <iant@google.com> PR go/48501 diff --git a/gcc/testsuite/g++.dg/template/asmgoto1.C b/gcc/testsuite/g++.dg/template/asmgoto1.C new file mode 100644 index 0000000..6a3cbce --- /dev/null +++ b/gcc/testsuite/g++.dg/template/asmgoto1.C @@ -0,0 +1,18 @@ +// PR c++/52247 +// { dg-do compile } + +template <int N> +bool +bar () +{ + __asm goto ("" : : : : lab); + return true; +lab: + return false; +} + +bool +foo () +{ + return bar<0> (); +} |