From 75799b9884ef01e2fdedbbbd8932857bb5333ee7 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Tue, 4 Oct 2011 14:04:10 -0700 Subject: [PATCH] c-typeck.c (c_build_vec_shuffle_expr): Fix uninitialized variable. * c-typeck.c (c_build_vec_shuffle_expr): Fix uninitialized variable. Avoid save_expr unless two_arguments. From-SVN: r179525 --- gcc/ChangeLog | 5 +++++ gcc/c-typeck.c | 13 ++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a4c29fb4399..9e3f1a70d40 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2011-10-04 Richard Henderson + + * c-typeck.c (c_build_vec_shuffle_expr): Fix uninitialized variable. + Avoid save_expr unless two_arguments. + 2011-10-04 Ozkan Sezer * config/i386/mingw-w64.h (CPP_SPEC): Rename _REENTRANCE to diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c index 96ef4a3a660..e7528a715ba 100644 --- a/gcc/c-typeck.c +++ b/gcc/c-typeck.c @@ -2859,10 +2859,10 @@ build_function_call_vec (location_t loc, tree function, VEC(tree,gc) *params, tree c_build_vec_shuffle_expr (location_t loc, tree v0, tree v1, tree mask) { - tree vec_shuffle, tmp; + tree vec_shuffle; bool wrap = true; bool maybe_const = false; - bool two_arguments; + bool two_arguments = false; if (v1 == NULL_TREE) { @@ -2916,17 +2916,16 @@ c_build_vec_shuffle_expr (location_t loc, tree v0, tree v1, tree mask) } /* Avoid C_MAYBE_CONST_EXPRs inside VEC_SHUFFLE_EXPR. */ - tmp = c_fully_fold (v0, false, &maybe_const); - v0 = save_expr (tmp); + v0 = c_fully_fold (v0, false, &maybe_const); wrap &= maybe_const; - if (!two_arguments) + if (two_arguments) + v1 = v0 = save_expr (v0); + else { v1 = c_fully_fold (v1, false, &maybe_const); wrap &= maybe_const; } - else - v1 = v0; mask = c_fully_fold (mask, false, &maybe_const); wrap &= maybe_const; -- 2.30.2