diff options
| author | Marc Glisse <marc.glisse@inria.fr> | 2014-01-02 23:26:24 +0100 |
|---|---|---|
| committer | Marc Glisse <glisse@gcc.gnu.org> | 2014-01-02 22:26:24 +0000 |
| commit | 4939c5f336cf2b557a63911119641f5e2849a2b0 (patch) | |
| tree | 08be9415820ccf2941fc7d0b1d5aca50ab703999 /gcc/cp | |
| parent | f82356d214ef9fbb341c78734c4b54c8eec7d025 (diff) | |
| download | gcc-4939c5f336cf2b557a63911119641f5e2849a2b0.zip gcc-4939c5f336cf2b557a63911119641f5e2849a2b0.tar.gz gcc-4939c5f336cf2b557a63911119641f5e2849a2b0.tar.bz2 | |
re PR c++/59378 (Internal compiler error when using __builtin_shuffle in a template function)
2014-01-02 Marc Glisse <marc.glisse@inria.fr>
PR c++/59378
gcc/cp/
* typeck.c (build_x_vec_perm_expr): Handle non-dependent arguments
in templates.
gcc/testsuite/
* g++.dg/ext/pr59378.C: New file.
From-SVN: r206300
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/typeck.c | 23 |
2 files changed, 24 insertions, 5 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index d27c2a2..01a01ab 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2014-01-02 Marc Glisse <marc.glisse@inria.fr> + + PR c++/59378 + * typeck.c (build_x_vec_perm_expr): Handle non-dependent arguments + in templates. + 2014-01-02 Richard Sandiford <rdsandiford@googlemail.com> Update copyright years diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index f45c5b9..84e287e 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -4944,12 +4944,25 @@ build_x_vec_perm_expr (location_t loc, tree arg0, tree arg1, tree arg2, tsubst_flags_t complain) { - if (processing_template_decl - && (type_dependent_expression_p (arg0) + tree orig_arg0 = arg0; + tree orig_arg1 = arg1; + tree orig_arg2 = arg2; + if (processing_template_decl) + { + if (type_dependent_expression_p (arg0) || type_dependent_expression_p (arg1) - || type_dependent_expression_p (arg2))) - return build_min_nt_loc (loc, VEC_PERM_EXPR, arg0, arg1, arg2); - return c_build_vec_perm_expr (loc, arg0, arg1, arg2, complain & tf_error); + || type_dependent_expression_p (arg2)) + return build_min_nt_loc (loc, VEC_PERM_EXPR, arg0, arg1, arg2); + arg0 = build_non_dependent_expr (arg0); + if (arg1) + arg1 = build_non_dependent_expr (arg1); + arg2 = build_non_dependent_expr (arg2); + } + tree exp = c_build_vec_perm_expr (loc, arg0, arg1, arg2, complain & tf_error); + if (processing_template_decl && exp != error_mark_node) + return build_min_non_dep (VEC_PERM_EXPR, exp, orig_arg0, + orig_arg1, orig_arg2); + return exp; } /* Return a tree for the sum or difference (RESULTCODE says which) |