@@ -244,7 +244,7 @@ is_builtin_name (const char *name)
return true;
if (strncmp (name, "__atomic_", 9) == 0)
return true;
- if (flag_enable_cilkplus
+ if (flag_cilkplus
&& (!strcmp (name, "__cilkrts_detach")
|| !strcmp (name, "__cilkrts_pop_frame")))
return true;
@@ -174,7 +174,7 @@ along with GCC; see the file COPYING3. If not see
#undef DEF_CILKPLUS_BUILTIN
#define DEF_CILKPLUS_BUILTIN(ENUM, NAME, TYPE, ATTRS) \
DEF_BUILTIN (ENUM, NAME, BUILT_IN_NORMAL, BT_FN_INT_VAR, BT_LAST, \
- false, false, false, ATTRS, false, flag_enable_cilkplus)
+ false, false, false, ATTRS, false, flag_cilkplus)
/* Define an attribute list for math functions that are normally
"impure" because some of them may write into global memory for
@@ -5261,7 +5261,7 @@ c_define_builtins (tree va_list_ref_type_node, tree va_list_arg_type_node)
build_common_builtin_nodes ();
- if (flag_enable_cilkplus)
+ if (flag_cilkplus)
cilk_init_builtins ();
}
@@ -1384,7 +1384,7 @@ init_pragma (void)
omp_pragmas_simd[i].id, true, true);
}
- if (flag_enable_cilkplus && !flag_preprocess_only)
+ if (flag_cilkplus && !flag_preprocess_only)
cpp_register_deferred_pragma (parse_in, NULL, "simd", PRAGMA_CILK_SIMD,
true, false);
@@ -863,7 +863,7 @@ C ObjC C++ ObjC++
Where shorter, use canonicalized paths to systems headers.
fcilkplus
-C ObjC C++ ObjC++ LTO Report Var(flag_enable_cilkplus) Init(0)
+C ObjC C++ ObjC++ LTO Report Var(flag_cilkplus) Init(0)
Enable Cilk Plus
fcond-mismatch
@@ -1919,7 +1919,7 @@ c_parser_declaration_or_fndef (c_parser *parser, bool fndef_ok,
DECL_STRUCT_FUNCTION (current_function_decl)->function_start_locus
= c_parser_peek_token (parser)->location;
fnbody = c_parser_compound_statement (parser);
- if (flag_enable_cilkplus && contains_array_notation_expr (fnbody))
+ if (flag_cilkplus && contains_array_notation_expr (fnbody))
fnbody = expand_array_notation_exprs (fnbody);
if (nested)
{
@@ -3340,7 +3340,7 @@ c_parser_direct_declarator_inner (c_parser *parser, bool id_present,
dimen.value = NULL_TREE;
star_seen = false;
}
- else if (flag_enable_cilkplus
+ else if (flag_cilkplus
&& c_parser_next_token_is (parser, CPP_COLON))
{
dimen.value = error_mark_node;
@@ -3371,7 +3371,7 @@ c_parser_direct_declarator_inner (c_parser *parser, bool id_present,
}
if (c_parser_next_token_is (parser, CPP_CLOSE_SQUARE))
c_parser_consume_token (parser);
- else if (flag_enable_cilkplus
+ else if (flag_cilkplus
&& c_parser_next_token_is (parser, CPP_COLON))
{
error_at (c_parser_peek_token (parser)->location,
@@ -3783,7 +3783,7 @@ c_parser_attribute_any_word (c_parser *parser)
static inline bool
is_cilkplus_vector_p (tree name)
{
- if (flag_enable_cilkplus && is_attribute_p ("vector", name))
+ if (flag_cilkplus && is_attribute_p ("vector", name))
return true;
return false;
}
@@ -4009,7 +4009,7 @@ c_parser_attributes (c_parser *parser)
parser->lex_untranslated_string = false;
}
- if (flag_enable_cilkplus && !vec_safe_is_empty (parser->cilk_simd_fn_tokens))
+ if (flag_cilkplus && !vec_safe_is_empty (parser->cilk_simd_fn_tokens))
c_finish_cilk_simd_fn_tokens (parser);
return attrs;
}
@@ -4461,7 +4461,7 @@ c_parser_compound_statement (c_parser *parser)
c_parser_compound_statement_nostart (parser);
/* If the compound stmt contains array notations, then we expand them. */
- if (flag_enable_cilkplus && contains_array_notation_expr (stmt))
+ if (flag_cilkplus && contains_array_notation_expr (stmt))
stmt = expand_array_notation_exprs (stmt);
return c_end_compound_stmt (brace_loc, stmt, true);
}
@@ -4881,7 +4881,7 @@ c_parser_statement_after_labels (c_parser *parser)
case RID_CILK_SYNC:
c_parser_consume_token (parser);
c_parser_skip_until_found (parser, CPP_SEMICOLON, "expected %<;%>");
- if (!flag_enable_cilkplus)
+ if (!flag_cilkplus)
error_at (loc, "-fcilkplus must be enabled to use %<_Cilk_sync%>");
else
add_stmt (build_cilk_sync ());
@@ -5151,7 +5151,7 @@ c_parser_if_statement (c_parser *parser)
if_stmt = c_end_compound_stmt (loc, block, flag_isoc99);
/* If the if statement contains array notations, then we expand them. */
- if (flag_enable_cilkplus && contains_array_notation_expr (if_stmt))
+ if (flag_cilkplus && contains_array_notation_expr (if_stmt))
if_stmt = fix_conditional_array_notations (if_stmt);
add_stmt (if_stmt);
}
@@ -5178,7 +5178,7 @@ c_parser_switch_statement (c_parser *parser)
ce = c_parser_expression (parser);
ce = convert_lvalue_to_rvalue (switch_cond_loc, ce, true, false);
expr = ce.value;
- if (flag_enable_cilkplus && contains_array_notation_expr (expr))
+ if (flag_cilkplus && contains_array_notation_expr (expr))
{
error_at (switch_cond_loc,
"array notations cannot be used as a condition for switch "
@@ -5224,7 +5224,7 @@ c_parser_while_statement (c_parser *parser, bool ivdep)
block = c_begin_compound_stmt (flag_isoc99);
loc = c_parser_peek_token (parser)->location;
cond = c_parser_paren_condition (parser);
- if (flag_enable_cilkplus && contains_array_notation_expr (cond))
+ if (flag_cilkplus && contains_array_notation_expr (cond))
{
error_at (loc, "array notations cannot be used as a condition for while "
"statement");
@@ -5276,7 +5276,7 @@ c_parser_do_statement (c_parser *parser, bool ivdep)
new_cont = c_cont_label;
c_cont_label = save_cont;
cond = c_parser_paren_condition (parser);
- if (flag_enable_cilkplus && contains_array_notation_expr (cond))
+ if (flag_cilkplus && contains_array_notation_expr (cond))
{
error_at (loc, "array notations cannot be used as a condition for a "
"do-while statement");
@@ -5474,7 +5474,7 @@ c_parser_for_statement (c_parser *parser, bool ivdep)
else
{
cond = c_parser_condition (parser);
- if (flag_enable_cilkplus && contains_array_notation_expr (cond))
+ if (flag_cilkplus && contains_array_notation_expr (cond))
{
error_at (loc, "array notations cannot be used in a "
"condition for a for-loop");
@@ -6370,7 +6370,7 @@ c_parser_unary_expression (c_parser *parser)
op = c_parser_cast_expression (parser, NULL);
/* If there is array notations in op, we expand them. */
- if (flag_enable_cilkplus && TREE_CODE (op.value) == ARRAY_NOTATION_REF)
+ if (flag_cilkplus && TREE_CODE (op.value) == ARRAY_NOTATION_REF)
return fix_array_notation_expr (exp_loc, PREINCREMENT_EXPR, op);
else
{
@@ -6383,7 +6383,7 @@ c_parser_unary_expression (c_parser *parser)
op = c_parser_cast_expression (parser, NULL);
/* If there is array notations in op, we expand them. */
- if (flag_enable_cilkplus && TREE_CODE (op.value) == ARRAY_NOTATION_REF)
+ if (flag_cilkplus && TREE_CODE (op.value) == ARRAY_NOTATION_REF)
return fix_array_notation_expr (exp_loc, PREDECREMENT_EXPR, op);
else
{
@@ -7493,7 +7493,7 @@ c_parser_postfix_expression (c_parser *parser)
break;
case RID_CILK_SPAWN:
c_parser_consume_token (parser);
- if (!flag_enable_cilkplus)
+ if (!flag_cilkplus)
{
error_at (loc, "-fcilkplus must be enabled to use "
"%<_Cilk_spawn%>");
@@ -7645,7 +7645,7 @@ c_parser_postfix_expression_after_primary (c_parser *parser,
case CPP_OPEN_SQUARE:
/* Array reference. */
c_parser_consume_token (parser);
- if (flag_enable_cilkplus
+ if (flag_cilkplus
&& c_parser_peek_token (parser)->type == CPP_COLON)
/* If we are here, then we have something like this:
Array [ : ]
@@ -7664,7 +7664,7 @@ c_parser_postfix_expression_after_primary (c_parser *parser,
For 2 and 3 we handle it like we handle array notations. The
idx value we have above becomes the initial/start index.
*/
- if (flag_enable_cilkplus
+ if (flag_cilkplus
&& c_parser_peek_token (parser)->type == CPP_COLON)
expr.value = c_parser_array_notation (expr_loc, parser, idx,
expr.value);
@@ -7783,7 +7783,7 @@ c_parser_postfix_expression_after_primary (c_parser *parser,
/* Postincrement. */
c_parser_consume_token (parser);
/* If the expressions have array notations, we expand them. */
- if (flag_enable_cilkplus
+ if (flag_cilkplus
&& TREE_CODE (expr.value) == ARRAY_NOTATION_REF)
expr = fix_array_notation_expr (expr_loc, POSTINCREMENT_EXPR, expr);
else
@@ -7799,7 +7799,7 @@ c_parser_postfix_expression_after_primary (c_parser *parser,
/* Postdecrement. */
c_parser_consume_token (parser);
/* If the expressions have array notations, we expand them. */
- if (flag_enable_cilkplus
+ if (flag_cilkplus
&& TREE_CODE (expr.value) == ARRAY_NOTATION_REF)
expr = fix_array_notation_expr (expr_loc, POSTDECREMENT_EXPR, expr);
else
@@ -9626,7 +9626,7 @@ c_parser_omp_clause_name (c_parser *parser)
result = PRAGMA_OMP_CLAUSE_MAP;
else if (!strcmp ("mergeable", p))
result = PRAGMA_OMP_CLAUSE_MERGEABLE;
- else if (flag_enable_cilkplus && !strcmp ("mask", p))
+ else if (flag_cilkplus && !strcmp ("mask", p))
result = PRAGMA_CILK_CLAUSE_MASK;
break;
case 'n':
@@ -9638,7 +9638,7 @@ c_parser_omp_clause_name (c_parser *parser)
result = PRAGMA_OMP_CLAUSE_NUM_TEAMS;
else if (!strcmp ("num_threads", p))
result = PRAGMA_OMP_CLAUSE_NUM_THREADS;
- else if (flag_enable_cilkplus && !strcmp ("nomask", p))
+ else if (flag_cilkplus && !strcmp ("nomask", p))
result = PRAGMA_CILK_CLAUSE_NOMASK;
break;
case 'o':
@@ -9684,7 +9684,7 @@ c_parser_omp_clause_name (c_parser *parser)
result = PRAGMA_OMP_CLAUSE_UNTIED;
break;
case 'v':
- if (flag_enable_cilkplus && !strcmp ("vectorlength", p))
+ if (flag_cilkplus && !strcmp ("vectorlength", p))
result = PRAGMA_CILK_CLAUSE_VECTORLENGTH;
break;
}
@@ -12850,7 +12850,7 @@ static void
c_finish_omp_declare_simd (c_parser *parser, tree fndecl, tree parms,
vec<c_token> clauses)
{
- if (flag_enable_cilkplus
+ if (flag_cilkplus
&& clauses.exists () && !vec_safe_is_empty (parser->cilk_simd_fn_tokens))
{
error ("%<#pragma omp declare simd%> cannot be used in the same "
@@ -12887,7 +12887,7 @@ c_finish_omp_declare_simd (c_parser *parser, tree fndecl, tree parms,
gcc_assert (parser->tokens == &parser->tokens_buf[0]);
bool is_cilkplus_cilk_simd_fn = false;
- if (flag_enable_cilkplus && !vec_safe_is_empty (parser->cilk_simd_fn_tokens))
+ if (flag_cilkplus && !vec_safe_is_empty (parser->cilk_simd_fn_tokens))
{
parser->tokens = parser->cilk_simd_fn_tokens->address ();
parser->tokens_avail = vec_safe_length (parser->cilk_simd_fn_tokens);
@@ -13517,7 +13517,7 @@ static bool
c_parser_cilk_verify_simd (c_parser *parser,
enum pragma_context context)
{
- if (!flag_enable_cilkplus)
+ if (!flag_cilkplus)
{
warning (0, "pragma simd ignored because -fcilkplus is not enabled");
c_parser_skip_until_found (parser, CPP_PRAGMA_EOL, NULL);
@@ -2423,7 +2423,7 @@ build_array_ref (location_t loc, tree array, tree index)
|| TREE_TYPE (index) == error_mark_node)
return error_mark_node;
- if (flag_enable_cilkplus && contains_array_notation_expr (index))
+ if (flag_cilkplus && contains_array_notation_expr (index))
{
size_t rank = 0;
if (!find_rank (loc, index, index, true, &rank))
@@ -2853,7 +2853,7 @@ build_function_call_vec (location_t loc, tree function,
if (name && !strncmp (IDENTIFIER_POINTER (name), "__atomic_", 9))
origtypes = NULL;
- if (flag_enable_cilkplus
+ if (flag_cilkplus
&& is_cilkplus_reduce_builtin (function))
origtypes = NULL;
}
@@ -3061,7 +3061,7 @@ convert_arguments (tree typelist, vec<tree, va_gc> *values,
break;
}
}
- if (flag_enable_cilkplus && fundecl && is_cilkplus_reduce_builtin (fundecl))
+ if (flag_cilkplus && fundecl && is_cilkplus_reduce_builtin (fundecl))
return vec_safe_length (values);
/* Scan the given expressions and types, producing individual
@@ -4739,7 +4739,7 @@ build_compound_expr (location_t loc, tree expr1, tree expr2)
tree eptype = NULL_TREE;
tree ret;
- if (flag_enable_cilkplus
+ if (flag_cilkplus
&& (TREE_CODE (expr1) == CILK_SPAWN_STMT
|| TREE_CODE (expr2) == CILK_SPAWN_STMT))
{
@@ -9136,7 +9136,7 @@ c_finish_return (location_t loc, tree retval, tree origtype)
warning_at (loc, 0,
"function declared %<noreturn%> has a %<return%> statement");
- if (flag_enable_cilkplus && contains_array_notation_expr (retval))
+ if (flag_cilkplus && contains_array_notation_expr (retval))
{
/* Array notations are allowed in a return statement if it is inside a
built-in array notation reduction function. */
@@ -9149,7 +9149,7 @@ c_finish_return (location_t loc, tree retval, tree origtype)
return error_mark_node;
}
}
- if (flag_enable_cilkplus && retval && TREE_CODE (retval) == CILK_SPAWN_STMT)
+ if (flag_cilkplus && retval && TREE_CODE (retval) == CILK_SPAWN_STMT)
{
error_at (loc, "use of %<_Cilk_spawn%> in a return statement is not "
"allowed");
@@ -9450,7 +9450,7 @@ c_finish_if_stmt (location_t if_locus, tree cond, tree then_block,
else_block must be either 0 or be equal to the rank of the condition. If
the condition does not have array notations then break them up as it is
broken up in a normal expression. */
- if (flag_enable_cilkplus && contains_array_notation_expr (cond))
+ if (flag_cilkplus && contains_array_notation_expr (cond))
{
size_t then_rank = 0, cond_rank = 0, else_rank = 0;
if (!find_rank (if_locus, cond, cond, true, &cond_rank))
@@ -9525,7 +9525,7 @@ c_finish_loop (location_t start_locus, tree cond, tree incr, tree body,
{
tree entry = NULL, exit = NULL, t;
- if (flag_enable_cilkplus && contains_array_notation_expr (cond))
+ if (flag_cilkplus && contains_array_notation_expr (cond))
{
error_at (start_locus, "array notation expression cannot be used in a "
"loop%'s condition");
@@ -10074,12 +10074,12 @@ build_binary_op (location_t location, enum tree_code code,
/* When Cilk Plus is enabled and there are array notations inside op0, then
we check to see if there are builtin array notation functions. If
so, then we take on the type of the array notation inside it. */
- if (flag_enable_cilkplus && contains_array_notation_expr (op0))
+ if (flag_cilkplus && contains_array_notation_expr (op0))
orig_type0 = type0 = find_correct_array_notation_type (op0);
else
orig_type0 = type0 = TREE_TYPE (op0);
- if (flag_enable_cilkplus && contains_array_notation_expr (op1))
+ if (flag_cilkplus && contains_array_notation_expr (op1))
orig_type1 = type1 = find_correct_array_notation_type (op1);
else
orig_type1 = type1 = TREE_TYPE (op1);
@@ -97,7 +97,7 @@ extern tree cilk_call_setjmp (tree);
inline bool
fn_contains_cilk_spawn_p (function *f)
{
- return (flag_enable_cilkplus
+ return (flag_cilkplus
&& (f->calls_cilk_spawn || f->cilk_frame_decl != NULL_TREE));
}
@@ -6568,7 +6568,7 @@ convert_for_arg_passing (tree type, tree val, tsubst_flags_t complain)
bool
magic_varargs_p (tree fn)
{
- if (flag_enable_cilkplus && is_cilkplus_reduce_builtin (fn) != BUILT_IN_NONE)
+ if (flag_cilkplus && is_cilkplus_reduce_builtin (fn) != BUILT_IN_NONE)
return true;
if (DECL_BUILT_IN (fn))
@@ -7191,7 +7191,7 @@ build_cxx_call (tree fn, int nargs, tree *argarray,
/* If it is a built-in array notation function, then the return type of
the function is the element type of the array passed in as array
notation (i.e. the first parameter of the function). */
- if (flag_enable_cilkplus && TREE_CODE (fn) == CALL_EXPR)
+ if (flag_cilkplus && TREE_CODE (fn) == CALL_EXPR)
{
enum built_in_function bif =
is_cilkplus_reduce_builtin (CALL_EXPR_FN (fn));
@@ -1311,7 +1311,7 @@ cp_genericize (tree fndecl)
return;
/* Expand all the array notations here. */
- if (flag_enable_cilkplus
+ if (flag_cilkplus
&& contains_array_notation_expr (DECL_SAVED_TREE (fndecl)))
DECL_SAVED_TREE (fndecl) =
expand_array_notation_exprs (DECL_SAVED_TREE (fndecl));
@@ -7674,7 +7674,7 @@ grokfndecl (tree ctype,
if (TYPE_NOTHROW_P (type) || nothrow_libfn_p (decl))
TREE_NOTHROW (decl) = 1;
- if (flag_openmp || flag_enable_cilkplus)
+ if (flag_openmp || flag_cilkplus)
{
/* Adjust "omp declare simd" attributes. */
tree ods = lookup_attribute ("omp declare simd", *attrlist);
@@ -5808,7 +5808,7 @@ cp_parser_postfix_expression (cp_parser *parser, bool address_p, bool cast_p,
postfix_expression =
cp_parser_postfix_expression (parser, false, false,
false, false, &idk);
- if (!flag_enable_cilkplus)
+ if (!flag_cilkplus)
{
error_at (token->location, "-fcilkplus must be enabled to use"
" %<_Cilk_spawn%>");
@@ -5833,7 +5833,7 @@ cp_parser_postfix_expression (cp_parser *parser, bool address_p, bool cast_p,
}
case RID_CILK_SYNC:
- if (flag_enable_cilkplus)
+ if (flag_cilkplus)
{
tree sync_expr = build_cilk_sync ();
SET_EXPR_LOCATION (sync_expr,
@@ -6373,7 +6373,7 @@ cp_parser_postfix_open_square_expression (cp_parser *parser,
bool expr_nonconst_p;
maybe_warn_cpp0x (CPP0X_INITIALIZER_LISTS);
index = cp_parser_braced_list (parser, &expr_nonconst_p);
- if (flag_enable_cilkplus
+ if (flag_cilkplus
&& cp_lexer_peek_token (parser->lexer)->type == CPP_COLON)
{
error_at (cp_lexer_peek_token (parser->lexer)->location,
@@ -6383,7 +6383,7 @@ cp_parser_postfix_open_square_expression (cp_parser *parser,
return error_mark_node;
}
}
- else if (flag_enable_cilkplus)
+ else if (flag_cilkplus)
{
/* Here are have these two options:
ARRAY[EXP : EXP] - Array notation expr with default
@@ -17141,7 +17141,7 @@ cp_parser_direct_declarator (cp_parser* parser,
/* In here, we handle cases where attribute is used after
the function declaration. For example:
void func (int x) __attribute__((vector(..))); */
- if (flag_enable_cilkplus
+ if (flag_cilkplus
&& cp_next_tokens_can_be_gnu_attribute_p (parser))
{
cp_parser_parse_tentatively (parser);
@@ -21565,7 +21565,7 @@ cp_parser_gnu_attributes_opt (cp_parser* parser)
static inline bool
is_cilkplus_vector_p (tree name)
{
- if (flag_enable_cilkplus && is_attribute_p ("vector", name))
+ if (flag_cilkplus && is_attribute_p ("vector", name))
return true;
return false;
}
@@ -26934,7 +26934,7 @@ cp_parser_omp_clause_name (cp_parser *parser)
result = PRAGMA_OMP_CLAUSE_MAP;
else if (!strcmp ("mergeable", p))
result = PRAGMA_OMP_CLAUSE_MERGEABLE;
- else if (flag_enable_cilkplus && !strcmp ("mask", p))
+ else if (flag_cilkplus && !strcmp ("mask", p))
result = PRAGMA_CILK_CLAUSE_MASK;
break;
case 'n':
@@ -26942,7 +26942,7 @@ cp_parser_omp_clause_name (cp_parser *parser)
result = PRAGMA_OMP_CLAUSE_NOTINBRANCH;
else if (!strcmp ("nowait", p))
result = PRAGMA_OMP_CLAUSE_NOWAIT;
- else if (flag_enable_cilkplus && !strcmp ("nomask", p))
+ else if (flag_cilkplus && !strcmp ("nomask", p))
result = PRAGMA_CILK_CLAUSE_NOMASK;
else if (!strcmp ("num_teams", p))
result = PRAGMA_OMP_CLAUSE_NUM_TEAMS;
@@ -26990,7 +26990,7 @@ cp_parser_omp_clause_name (cp_parser *parser)
result = PRAGMA_OMP_CLAUSE_UNTIED;
break;
case 'v':
- if (flag_enable_cilkplus && !strcmp ("vectorlength", p))
+ if (flag_cilkplus && !strcmp ("vectorlength", p))
result = PRAGMA_CILK_CLAUSE_VECTORLENGTH;
break;
}
@@ -28319,7 +28319,7 @@ cp_parser_omp_all_clauses (cp_parser *parser, omp_clause_mask mask,
saw_error:
/* In Cilk Plus SIMD enabled functions there is no pragma_token, so
no reason to skip to the end. */
- if (!(flag_enable_cilkplus && pragma_tok == NULL))
+ if (!(flag_cilkplus && pragma_tok == NULL))
cp_parser_skip_to_pragma_eol (parser, pragma_tok);
if (finish_p)
return finish_omp_clauses (clauses);
@@ -8613,7 +8613,7 @@ apply_late_template_attributes (tree *decl_p, tree attributes, int attr_flags,
{
*p = TREE_CHAIN (t);
TREE_CHAIN (t) = NULL_TREE;
- if ((flag_openmp || flag_enable_cilkplus)
+ if ((flag_openmp || flag_cilkplus)
&& is_attribute_p ("omp declare simd",
get_attribute_name (t))
&& TREE_VALUE (t))
@@ -3012,7 +3012,7 @@ cp_build_array_ref (location_t loc, tree array, tree idx,
/* If an array's index is an array notation, then its rank cannot be
greater than one. */
- if (flag_enable_cilkplus && contains_array_notation_expr (idx))
+ if (flag_cilkplus && contains_array_notation_expr (idx))
{
size_t rank = 0;
@@ -6188,7 +6188,7 @@ cp_build_compound_expr (tree lhs, tree rhs, tsubst_flags_t complain)
if (lhs == error_mark_node || rhs == error_mark_node)
return error_mark_node;
- if (flag_enable_cilkplus
+ if (flag_cilkplus
&& (TREE_CODE (lhs) == CILK_SPAWN_STMT
|| TREE_CODE (rhs) == CILK_SPAWN_STMT))
{
@@ -8323,7 +8323,7 @@ check_return_expr (tree retval, bool *no_warning)
*no_warning = false;
- if (flag_enable_cilkplus && retval && TREE_CODE (retval) == CILK_SPAWN_STMT)
+ if (flag_cilkplus && retval && TREE_CODE (retval) == CILK_SPAWN_STMT)
{
error_at (EXPR_LOCATION (retval), "use of %<_Cilk_spawn%> in a return "
"statement is not allowed");
@@ -105,7 +105,7 @@ define_builtin_macros_for_compilation_flags (cpp_reader *pfile)
cpp_define_formatted (pfile, "__FINITE_MATH_ONLY__=%d",
flag_finite_math_only);
- if (flag_enable_cilkplus)
+ if (flag_cilkplus)
cpp_define (pfile, "__cilk=200");
}
@@ -2405,7 +2405,7 @@ ira_setup_eliminable_regset (void)
|| (SUPPORTS_STACK_ALIGNMENT && crtl->stack_realign_needed)
/* We need a frame pointer for all Cilk Plus functions that use
Cilk keywords. */
- || (flag_enable_cilkplus && cfun->is_cilk_function)
+ || (flag_cilkplus && cfun->is_cilk_function)
|| targetm.frame_pointer_required ());
/* The chance that FRAME_POINTER_NEEDED is changed from inspecting
@@ -1183,7 +1183,7 @@ lto_init (void)
build_reference_type (va_list_type_node));
}
- if (flag_enable_cilkplus)
+ if (flag_cilkplus)
cilk_init_builtins ();
targetm.init_builtins ();
@@ -8328,7 +8328,7 @@ static bool
gate_expand_omp (void)
{
return ((flag_openmp != 0 || flag_openmp_simd != 0
- || flag_enable_cilkplus != 0) && !seen_error ());
+ || flag_cilkplus != 0) && !seen_error ());
}
namespace {
@@ -10139,7 +10139,7 @@ execute_lower_omp (void)
/* This pass always runs, to provide PROP_gimple_lomp.
But there is nothing to do unless -fopenmp is given. */
- if (flag_openmp == 0 && flag_openmp_simd == 0 && flag_enable_cilkplus == 0)
+ if (flag_openmp == 0 && flag_openmp_simd == 0 && flag_cilkplus == 0)
return 0;
all_contexts = splay_tree_new (splay_tree_compare_pointers, 0,
@@ -10258,7 +10258,7 @@ diagnose_sb_0 (gimple_stmt_iterator *gsi_p,
#endif
bool cilkplus_block = false;
- if (flag_enable_cilkplus)
+ if (flag_cilkplus)
{
if ((branch_ctx
&& gimple_code (branch_ctx) == GIMPLE_OMP_FOR
@@ -10587,7 +10587,7 @@ diagnose_omp_structured_block_errors (void)
static bool
gate_diagnose_omp_blocks (void)
{
- return flag_openmp || flag_enable_cilkplus;
+ return flag_openmp || flag_cilkplus;
}
namespace {
@@ -10696,7 +10696,7 @@ simd_clone_clauses_extract (struct cgraph_node *node, tree clauses,
be cloned have a distinctive artificial label in addition to "omp
declare simd". */
bool cilk_clone
- = (flag_enable_cilkplus
+ = (flag_cilkplus
&& lookup_attribute ("cilk simd function",
DECL_ATTRIBUTES (node->decl)));
@@ -11781,7 +11781,7 @@ public:
/* opt_pass methods: */
bool gate () { return ((flag_openmp || flag_openmp_simd
- || flag_enable_cilkplus || (in_lto_p && !flag_wpa))
+ || flag_cilkplus || (in_lto_p && !flag_wpa))
&& (targetm.simd_clone.compute_vecsize_and_simdlen
!= NULL)); }
unsigned int execute () { return ipa_omp_simd_clone (); }