===================================================================
@@ -161,7 +161,7 @@ DEFGSCODE(GIMPLE_EH_MUST_NOT_THROW, "gim
/* GIMPLE_EH_ELSE <N_BODY, E_BODY> must be the sole contents of
a GIMPLE_TRY_FINALLY node. For all normal exits from the try block,
- we N_BODY is run; for all exception exits from the try block,
+ N_BODY is run; for all exception exits from the try block,
E_BODY is run. */
DEFGSCODE(GIMPLE_EH_ELSE, "gimple_eh_else", GSS_EH_ELSE)
===================================================================
@@ -4367,12 +4367,6 @@ ipa_tm_insert_gettmclone_call (struct cg
if (gimple_call_nothrow_p (stmt))
gimple_call_set_nothrow (stmt, true);
- /* ??? This is a hack to prevent tree-eh.c inlineable_call_p from
- deciding that the indirect call we have after this transformation
- might be inlinable, and thus changing the value of can_throw_internal,
- and thus requiring extra EH edges. */
- gimple_call_set_noinline_p (stmt);
-
gimple_call_set_fn (stmt, callfn);
/* Discarding OBJ_TYPE_REF above may produce incompatible LHS and RHS
===================================================================
@@ -634,7 +634,7 @@ is_tm_builtin (const_tree fndecl)
case BUILT_IN_TM_GETTMCLONE_IRR:
case BUILT_IN_TM_MEMCPY:
case BUILT_IN_TM_MEMMOVE:
- case BUILT_IN_TM_MEMSET:
+ case BUILT_IN_TM_MEMSET:
CASE_BUILT_IN_TM_STORE (1):
CASE_BUILT_IN_TM_STORE (2):
CASE_BUILT_IN_TM_STORE (4):
===================================================================
@@ -1788,9 +1788,10 @@ walk_gimple_stmt (gimple_stmt_iterator *
a value to return. */
gcc_assert (tree_ret == NULL);
- /* Re-read stmt in case the callback changed it. */
if (wi && wi->removed_stmt)
return NULL;
+
+ /* Re-read stmt in case the callback changed it. */
stmt = gsi_stmt (*gsi);
}
===================================================================
@@ -105,7 +105,6 @@ enum gf_mask {
GF_CALL_NOTHROW = 1 << 5,
GF_CALL_ALLOCA_FOR_VAR = 1 << 6,
GF_CALL_INTERNAL = 1 << 7,
- GF_CALL_NOINLINE = 1 << 8,
GF_OMP_PARALLEL_COMBINED = 1 << 0,
/* True on an GIMPLE_OMP_RETURN statement if the return does not require
@@ -2490,22 +2489,6 @@ gimple_call_alloca_for_var_p (gimple s)
return (s->gsbase.subcode & GF_CALL_ALLOCA_FOR_VAR) != 0;
}
-/* Return true if S is a noinline call. */
-
-static inline bool
-gimple_call_noinline_p (gimple s)
-{
- GIMPLE_CHECK (s, GIMPLE_CALL);
- return (s->gsbase.subcode & GF_CALL_NOINLINE) != 0;
-}
-
-static inline void
-gimple_call_set_noinline_p (gimple s)
-{
- GIMPLE_CHECK (s, GIMPLE_CALL);
- s->gsbase.subcode |= GF_CALL_NOINLINE;
-}
-
/* Copy all the GF_CALL_* flags from ORIG_CALL to DEST_CALL. */
static inline void