From patchwork Wed Nov 24 15:40:41 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Richard Biener <rguenther@suse.de>
X-Patchwork-Id: 72907
Return-Path: 
 <gcc-patches-return-279399-incoming=patchwork.ozlabs.org@gcc.gnu.org>
X-Original-To: incoming@patchwork.ozlabs.org
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
Received: from sourceware.org (server1.sourceware.org [209.132.180.131])
	by ozlabs.org (Postfix) with SMTP id AF93DB6F14
	for <incoming@patchwork.ozlabs.org>;
	Thu, 25 Nov 2010 02:40:58 +1100 (EST)
Received: (qmail 11944 invoked by alias); 24 Nov 2010 15:40:50 -0000
Received: (qmail 11891 invoked by uid 22791); 24 Nov 2010 15:40:49 -0000
X-SWARE-Spam-Status: No, hits=-3.4 required=5.0	tests=AWL, BAYES_00,
	T_RP_MATCHES_RCVD
X-Spam-Check-By: sourceware.org
Received: from cantor2.suse.de (HELO mx2.suse.de) (195.135.220.15) by
	sourceware.org (qpsmtpd/0.43rc1) with ESMTP;
	Wed, 24 Nov 2010 15:40:44 +0000
Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.221.2])	by
	mx2.suse.de (Postfix) with ESMTP id E0CD689471	for
	<gcc-patches@gcc.gnu.org>; Wed, 24 Nov 2010 16:40:41 +0100 (CET)
Date: Wed, 24 Nov 2010 16:40:41 +0100 (CET)
From: Richard Guenther <rguenther@suse.de>
To: gcc-patches@gcc.gnu.org
Subject: [PATCH][LTO] Conversion oversight in input_gimple_stmt
Message-ID: <alpine.LNX.2.00.1011241639460.23074@zhemvz.fhfr.qr>
User-Agent: Alpine 2.00 (LNX 1167 2008-08-23)
MIME-Version: 1.0
Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
List-Id: <gcc-patches.gcc.gnu.org>
List-Unsubscribe: 
 <mailto:gcc-patches-unsubscribe-incoming=patchwork.ozlabs.org@gcc.gnu.org>
List-Archive: <http://gcc.gnu.org/ml/gcc-patches/>
List-Post: <mailto:gcc-patches@gcc.gnu.org>
List-Help: <mailto:gcc-patches-help@gcc.gnu.org>
Sender: gcc-patches-owner@gcc.gnu.org
Delivered-To: mailing list gcc-patches@gcc.gnu.org

When fixing up TYPE_CANONICAL merging I forgot to update one callsite
of gimple_types_compatible_p.  Fixed with the following, bootstrapped
and tested on x86_64-unknown-linux-gnu, SPEC 2k6 built with -flto.

Installed.

Richard.

2010-11-24  Richard Guenther  <rguenther@suse.de>

	* lto-streamer-in.c (input_gimple_stmt): Use types_compatible_p.

Index: gcc/lto-streamer-in.c
===================================================================
--- gcc/lto-streamer-in.c	(revision 167115)
+++ gcc/lto-streamer-in.c	(working copy)
@@ -967,9 +967,8 @@ input_gimple_stmt (struct lto_input_bloc
 			  == DECL_NONADDRESSABLE_P (field)
 			  && gimple_compare_field_offset (tem, field))
 			{
-			  if (gimple_types_compatible_p (TREE_TYPE (tem),
-							 TREE_TYPE (field),
-							 GTC_DIAG))
+			  if (types_compatible_p (TREE_TYPE (tem),
+						  TREE_TYPE (field)))
 			    break;
 			  else
 			    closest_match = tem;