re PR lto/45667 (ICE: verify_stmts failed: type mismatch in address expression with -flto)

2010-10-20  Richard Guenther  <rguenther@suse.de>

	PR lto/45667
	* lto-streamer-out.c (output_gimple_stmt): Fix typo.
	* tree-cfg.c (verify_gimple_call): Properly get the call fndecl.
	(verify_gimple_assign_single): Disable ADDR_EXPR type check
	when in LTO.

	* g++.dg/lto/20101020-1_0.h: New testcase.
	* g++.dg/lto/20101020-1_0.C: Likewise.
	* g++.dg/lto/20101020-1_1.C: Likewise.

From-SVN: r165725

gcc/ChangeLog

+2010-10-20  Richard Guenther  <rguenther@suse.de>
+
+	PR lto/45667
+	* lto-streamer-out.c (output_gimple_stmt): Fix typo.
+	* tree-cfg.c (verify_gimple_call): Properly get the call fndecl.
+	(verify_gimple_assign_single): Disable ADDR_EXPR type check
+	when in LTO.
+
 2010-10-20  Vladimir Makarov  <vmakarov@redhat.com>
 
 	PR fortran/42169

gcc/lto-streamer-out.c

@@ -1763,7 +1763,7 @@ output_gimple_stmt (struct output_block *ob, gimple stmt)
 	  if (op)
 	    {
 	      tree *basep = &op;
-	      if (handled_component_p (*basep))
+	      while (handled_component_p (*basep))
 		basep = &TREE_OPERAND (*basep, 0);
 	      if (TREE_CODE (*basep) == VAR_DECL
 		  && !auto_var_in_fn_p (*basep, current_function_decl))

gcc/testsuite/ChangeLog

+2010-10-20  Richard Guenther  <rguenther@suse.de>
+
+	PR lto/45667
+	* g++.dg/lto/20101020-1_0.h: New testcase.
+	* g++.dg/lto/20101020-1_0.C: Likewise.
+	* g++.dg/lto/20101020-1_1.C: Likewise.
+
 2010-10-20  Dmitry Melnik  <dm@ispras.ru>
 
 	* gcc.dg/20101013-1.c: New test.

gcc/testsuite/g++.dg/lto/20101020-1_0.C

+// { dg-lto-do link }
+
+#include "20101020-1_0.h"
+A::A ()
+{
+  foo (&A::bar);
+}
+int main() { return 0; }

gcc/testsuite/g++.dg/lto/20101020-1_0.h

+struct A;
+typedef void (A::*Am1) (void *);
+typedef void (A::*Am2) ();
+
+struct B
+{
+  Am2 am2;
+};
+
+struct A
+{
+  A ();
+  struct B b;
+  struct C *c;
+  struct D *d;
+  void foo (Am1);
+  void bar (void *);
+};
+
+struct C
+{
+};
+

gcc/testsuite/g++.dg/lto/20101020-1_1.C

+#include "20101020-1_0.h"
+struct D
+{
+};
+void A::bar (void *)
+{
+}
+void A::foo (Am1)
+{
+}
+

gcc/tree-cfg.c

@@ -3107,8 +3107,7 @@ verify_gimple_call (gimple stmt)
      call, and the decl should have DECL_STATIC_CHAIN set.  */
   if (gimple_call_chain (stmt))
     {
-      if (TREE_CODE (fn) != ADDR_EXPR
-	  || TREE_CODE (TREE_OPERAND (fn, 0)) != FUNCTION_DECL)
+      if (!gimple_call_fndecl (stmt))
 	{
 	  error ("static chain in indirect gimple call");
 	  return true;
@@ -3698,7 +3697,13 @@ verify_gimple_assign_single (gimple stmt)
 	    return true;
 	  }
 
-	if (!types_compatible_p (TREE_TYPE (op), TREE_TYPE (TREE_TYPE (rhs1)))
+	/* Technically there is no longer a need for matching types, but
+	   gimple hygiene asks for this check.  In LTO we can end up
+	   combining incompatible units and thus end up with addresses
+	   of globals that change their type to a common one.  */
+	if (!in_lto_p
+	    && !types_compatible_p (TREE_TYPE (op),
+				    TREE_TYPE (TREE_TYPE (rhs1)))
 	    && !one_pointer_to_useless_type_conversion_p (TREE_TYPE (rhs1),
 							  TREE_TYPE (op)))
 	  {