* tree-chkp.h (chkp_insert_retbnd_call): New.
* tree-chkp.c (chkp_insert_retbnd_call): New.
* ipa-split.c (insert_bndret_call_after): Remove.
(split_function): Use chkp_insert_retbnd_call.
* cgraphunit.c (cgraph_node::expand_thunk): Build returned
bounds for instrumented functions.
gcc/testsuite/
* gcc/testsuite/gcc.target/i386/thunk-retbnd.c: New.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@221917
138bc75d-0d04-0410-961f-
82ee72b054a4
+2015-04-08 Ilya Enkovich <ilya.enkovich@intel.com>
+
+ * tree-chkp.h (chkp_insert_retbnd_call): New.
+ * tree-chkp.c (chkp_insert_retbnd_call): New.
+ * ipa-split.c (insert_bndret_call_after): Remove.
+ (split_function): Use chkp_insert_retbnd_call.
+ * cgraphunit.c (cgraph_node::expand_thunk): Build returned
+ bounds for instrumented functions.
+
2015-04-07 Jan Hubicka <hubicka@ucw.cz>
PR ipa/65540
int i;
tree resdecl;
tree restmp = NULL;
+ tree resbnd = NULL;
gcall *call;
greturn *ret;
gsi_insert_after (&bsi, call, GSI_NEW_STMT);
if (!alias_is_noreturn)
{
+ if (instrumentation_clone
+ && !DECL_BY_REFERENCE (resdecl)
+ && restmp
+ && BOUNDED_P (restmp))
+ {
+ resbnd = chkp_insert_retbnd_call (NULL, restmp, &bsi);
+ create_edge (get_create (gimple_call_fndecl (gsi_stmt (bsi))),
+ as_a <gcall *> (gsi_stmt (bsi)),
+ callees->count, callees->frequency);
+ }
+
if (restmp && !this_adjusting
&& (fixed_offset || virtual_offset))
{
ret = gimple_build_return (restmp);
else
ret = gimple_build_return (resdecl);
+ gimple_return_set_retbnd (ret, resbnd);
gsi_insert_after (&bsi, ret, GSI_NEW_STMT);
}
BITMAP_FREE (current.ssa_names_to_pass);
}
-/* Build and insert initialization of returned bounds RETBND
- for returned value RETVAL. Statements are inserted after
- a statement pointed by GSI and GSI is modified to point to
- the last inserted statement. */
-
-static void
-insert_bndret_call_after (tree retbnd, tree retval, gimple_stmt_iterator *gsi)
-{
- tree fndecl = targetm.builtin_chkp_function (BUILT_IN_CHKP_BNDRET);
- gimple bndret = gimple_build_call (fndecl, 1, retval);
- gimple_call_set_lhs (bndret, retbnd);
- gsi_insert_after (gsi, bndret, GSI_CONTINUE_LINKING);
-}
-
/* Split function at SPLIT_POINT. */
static void
}
/* Build bndret call to obtain returned bounds. */
if (retbnd)
- insert_bndret_call_after (retbnd, retval, &gsi);
+ chkp_insert_retbnd_call (retbnd, retval, &gsi);
gimple_call_set_lhs (call, retval);
update_stmt (call);
}
gsi_insert_after (&gsi, call, GSI_NEW_STMT);
/* Build bndret call to obtain returned bounds. */
if (retbnd)
- insert_bndret_call_after (retbnd, retval, &gsi);
+ chkp_insert_retbnd_call (retbnd, retval, &gsi);
if (tsan_func_exit_call)
gsi_insert_after (&gsi, tsan_func_exit_call, GSI_NEW_STMT);
ret = gimple_build_return (retval);
+2015-04-08 Ilya Enkovich <ilya.enkovich@intel.com>
+
+ * gcc/testsuite/gcc.target/i386/thunk-retbnd.c: New.
+
2015-04-08 Eric Botcazou <ebotcazou@adacore.com>
* gnat.dg/opt48.adb: New test.
--- /dev/null
+/* { dg-do compile } */
+/* { dg-require-effective-target mpx } */
+/* { dg-options "-O2 -fcheck-pointer-bounds -mmpx -fdump-tree-optimized" } */
+/* { dg-final { scan-tree-dump-times "return &glob," 2 "optimized" } } */
+/* { dg-final { cleanup-tree-dump "optimized" } } */
+
+int glob;
+
+int *
+test1 (void)
+{
+ return &glob;
+}
+
+int *
+test2 (void)
+{
+ return test1 ();
+}
expand_normal (bndstx);
}
+/* Build retbnd call for returned value RETVAL.
+
+ If BNDVAL is not NULL then result is stored
+ in it. Otherwise a temporary is created to
+ hold returned value.
+
+ GSI points to a position for a retbnd call
+ and is set to created stmt.
+
+ Cgraph edge is created for a new call if
+ UPDATE_EDGE is 1.
+
+ Obtained bounds are returned. */
+tree
+chkp_insert_retbnd_call (tree bndval, tree retval,
+ gimple_stmt_iterator *gsi)
+{
+ gimple call;
+
+ if (!bndval)
+ bndval = create_tmp_reg (pointer_bounds_type_node, "retbnd");
+
+ call = gimple_build_call (chkp_ret_bnd_fndecl, 1, retval);
+ gimple_call_set_lhs (call, bndval);
+ gsi_insert_after (gsi, call, GSI_CONTINUE_LINKING);
+
+ return bndval;
+}
+
/* Mark statement S to not be instrumented. */
static void
chkp_mark_stmt (gimple s)
extern bool chkp_gimple_call_builtin_p (gimple call,
enum built_in_function code);
extern void chkp_expand_bounds_reset_for_mem (tree mem, tree ptr);
+extern tree chkp_insert_retbnd_call (tree bndval, tree retval,
+ gimple_stmt_iterator *gsi);
#endif /* GCC_TREE_CHKP_H */