Hello Everyone, This patch is for the Cilkplus GCC branch. It will add a new function parameter (CALL_NORMAL) to build_special member_call. This patch is needed to fix a merge issue.
Thanks, Balaji V. Iyer.
diff --git a/gcc/cp/ChangeLog.cilk b/gcc/cp/ChangeLog.cilk index 1162a16..cbf022f 100644 --- a/gcc/cp/ChangeLog.cilk +++ b/gcc/cp/ChangeLog.cilk @@ -1,3 +1,8 @@ +2011-10-22 Balaji V. Iyer <balaji.v.i...@intel.com> + + * typeck2.c (split_nonconstant_init_1): Added "CALL_NORMAL" parameter + to build_special_member_call function. + 2011-09-08 Balaji V. Iyer <balaji.v.i...@intel.com> * cp-tree.h (FOR_SCOPE): Changed FOR_STMT_CHECK to diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c index e7d4159..b61d5b9 100644 --- a/gcc/cp/typeck2.c +++ b/gcc/cp/typeck2.c @@ -571,7 +571,7 @@ split_nonconstant_init_1 (tree dest, tree init) { code = (build_special_member_call (sub, complete_dtor_identifier, NULL, inner_type, - LOOKUP_NORMAL, tf_warning_or_error)); + LOOKUP_NORMAL, CALL_NORMAL, tf_warning_or_error)); finish_eh_cleanup (code); }