re PR middle-end/70877 ([MPX] ICE in in convert_move)

gcc/

	PR middle-end/70877
	* tree-chkp.c (chkp_add_bounds_to_call_stmt): Handle
	calls with type casted fndecl.

gcc/testsuite/

	PR middle-end/70877
	* gcc.target/i386/pr70877.c: New test.

From-SVN: r236088

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 941748c10eb9300cbaf9357db0ff649e46fb112c..562d303ca6abffe4c6e033c196e62b69ad432cc0 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -3,6 +3,12 @@
        * dwarf2out.c (resolve_args_picking_1): Consider DW_OP_neg as an
        unary operation, not a binary one.
 
+2016-05-10  Ilya Enkovich  <ilya.enkovich@intel.com>
+
+       PR middle-end/70877
+       * tree-chkp.c (chkp_add_bounds_to_call_stmt): Handle
+       calls with type casted fndecl.
+
 2016-05-10  Ilya Enkovich  <ilya.enkovich@intel.com>
 
        PR tree-optimization/70786

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1e42f38989cb2505437f0b58f61808f8106572ca..36b8e2f926d21940e39031cd703783a87bc33718 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -2,6 +2,11 @@
 
        * gnat.dg/debug6.adb, gnat.dg/debug6_pkg.ads: New testcase.
 
+2016-05-10  Ilya Enkovich  <ilya.enkovich@intel.com>
+
+       PR middle-end/70877
+       * gcc.target/i386/pr70877.c: New test.
+
 2016-05-10  Ilya Enkovich  <ilya.enkovich@intel.com>
 
        PR tree-optimization/70786

diff --git a/gcc/testsuite/gcc.target/i386/pr70877.c b/gcc/testsuite/gcc.target/i386/pr70877.c
new file mode 100644 (file)
index 0000000..4269e84
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr70877.c
@@ -0,0 +1,14 @@
+/* { dg-do compile { target { ! x32 } } } */
+/* { dg-options "-fcheck-pointer-bounds -mmpx" } */
+
+int foo(int);
+
+typedef struct {
+  double d;
+  int a;
+} str_t;
+
+void bar(double d, int i, str_t s)
+{
+  d = ((double (*) (int)) foo) (i); /* { dg-warning "function called through a non-compatible type" } */
+}

diff --git a/gcc/tree-chkp.c b/gcc/tree-chkp.c
index 8c7d214e0e3b3c809386d2e20fa68837941059de..4ca2d34607c664f19a01ffdb7dacdf58d1343bc9 100644 (file)
--- a/gcc/tree-chkp.c
+++ b/gcc/tree-chkp.c
@@ -1853,7 +1853,9 @@ chkp_add_bounds_to_call_stmt (gimple_stmt_iterator *gsi)
 
   /* If function decl is available then use it for
      formal arguments list.  Otherwise use function type.  */
-  if (fndecl && DECL_ARGUMENTS (fndecl))
+  if (fndecl
+      && DECL_ARGUMENTS (fndecl)
+      && gimple_call_fntype (call) == TREE_TYPE (fndecl))
     first_formal_arg = DECL_ARGUMENTS (fndecl);
   else
     {
@@ -1929,7 +1931,16 @@ chkp_add_bounds_to_call_stmt (gimple_stmt_iterator *gsi)
     {
       tree new_decl = chkp_maybe_create_clone (fndecl)->decl;
       gimple_call_set_fndecl (new_call, new_decl);
-      gimple_call_set_fntype (new_call, TREE_TYPE (new_decl));
+      /* In case of a type cast we should modify used function
+        type instead of using type of new fndecl.  */
+      if (gimple_call_fntype (call) != TREE_TYPE (fndecl))
+       {
+         tree type = gimple_call_fntype (call);
+         type = chkp_copy_function_type_adding_bounds (type);
+         gimple_call_set_fntype (new_call, type);
+       }
+      else
+       gimple_call_set_fntype (new_call, TREE_TYPE (new_decl));
     }
   /* For indirect call we should fix function pointer type if
      pass some bounds.  */