From patchwork Fri May 13 13:59:26 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 95485 Return-Path: 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 23FA1B6F07 for ; Sat, 14 May 2011 00:00:05 +1000 (EST) Received: (qmail 7904 invoked by alias); 13 May 2011 13:59:47 -0000 Received: (qmail 7694 invoked by uid 22791); 13 May 2011 13:59:45 -0000 X-SWARE-Spam-Status: No, hits=-3.3 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; Fri, 13 May 2011 13:59:28 +0000 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.221.2]) by mx2.suse.de (Postfix) with ESMTP id 6EC578726A for ; Fri, 13 May 2011 15:59:26 +0200 (CEST) Date: Fri, 13 May 2011 15:59:26 +0200 (CEST) From: Richard Guenther To: gcc-patches@gcc.gnu.org Subject: [PATCH][?/n] Cleanup LTO type merging Message-ID: 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: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org This gets rid of type pair caching in the canonical type comparison. Bootstrapped and tested on x86_64-unknown-linux-gnu, applied. Richard. 2011-05-13 Richard Guenther * gimple.c (gimple_canonical_types_compatible_p): Do not use type-pair caching, do not compare hashes. Index: gcc/gimple.c =================================================================== --- gcc/gimple.c (revision 173730) +++ gcc/gimple.c (working copy) @@ -4569,8 +4569,6 @@ gimple_register_type (tree t) static bool gimple_canonical_types_compatible_p (tree t1, tree t2) { - type_pair_t p = NULL; - /* Before starting to set up the SCC machinery handle simple cases. */ /* Check first for the obvious case of pointer identity. */ @@ -4656,27 +4654,9 @@ gimple_canonical_types_compatible_p (tre return true; } - /* If the hash values of t1 and t2 are different the types can't - possibly be the same. This helps keeping the type-pair hashtable - small, only tracking comparisons for hash collisions. */ - if (gimple_canonical_type_hash (t1) != gimple_canonical_type_hash (t2)) - return false; - - /* If we've visited this type pair before (in the case of aggregates - with self-referential types), and we made a decision, return it. */ - p = lookup_type_pair (t1, t2, >c_visited, >c_ob); - if (p->same_p[GTC_DIAG] == 0 || p->same_p[GTC_DIAG] == 1) - { - /* We have already decided whether T1 and T2 are the - same, return the cached result. */ - return p->same_p[GTC_DIAG] == 1; - } - - gcc_assert (p->same_p[GTC_DIAG] == -2); - /* If their attributes are not the same they can't be the same type. */ if (!attribute_list_equal (TYPE_ATTRIBUTES (t1), TYPE_ATTRIBUTES (t2))) - goto different_types; + return false; /* Do type-specific comparisons. */ switch (TREE_CODE (t1)) @@ -4687,7 +4667,7 @@ gimple_canonical_types_compatible_p (tre if (!gimple_canonical_types_compatible_p (TREE_TYPE (t1), TREE_TYPE (t2)) || TYPE_STRING_FLAG (t1) != TYPE_STRING_FLAG (t2) || TYPE_NONALIASED_COMPONENT (t1) != TYPE_NONALIASED_COMPONENT (t2)) - goto different_types; + return false; else { tree i1 = TYPE_DOMAIN (t1); @@ -4696,16 +4676,16 @@ gimple_canonical_types_compatible_p (tre /* For an incomplete external array, the type domain can be NULL_TREE. Check this condition also. */ if (i1 == NULL_TREE && i2 == NULL_TREE) - goto same_types; + return true; else if (i1 == NULL_TREE || i2 == NULL_TREE) - goto different_types; + return false; /* If for a complete array type the possibly gimplified sizes are different the types are different. */ else if (((TYPE_SIZE (i1) != NULL) ^ (TYPE_SIZE (i2) != NULL)) || (TYPE_SIZE (i1) && TYPE_SIZE (i2) && !operand_equal_p (TYPE_SIZE (i1), TYPE_SIZE (i2), 0))) - goto different_types; + return false; else { tree min1 = TYPE_MIN_VALUE (i1); @@ -4724,9 +4704,9 @@ gimple_canonical_types_compatible_p (tre && ((TREE_CODE (max1) == PLACEHOLDER_EXPR && TREE_CODE (max2) == PLACEHOLDER_EXPR) || operand_equal_p (max1, max2, 0))))) - goto same_types; + return true; else - goto different_types; + return false; } } @@ -4734,7 +4714,7 @@ gimple_canonical_types_compatible_p (tre /* Method types should belong to the same class. */ if (!gimple_canonical_types_compatible_p (TYPE_METHOD_BASETYPE (t1), TYPE_METHOD_BASETYPE (t2))) - goto different_types; + return false; /* Fallthru */ @@ -4745,13 +4725,13 @@ gimple_canonical_types_compatible_p (tre (TREE_TYPE (t1), TREE_TYPE (t2)) && !gimple_canonical_types_compatible_p (TREE_TYPE (t1), TREE_TYPE (t2))) - goto different_types; + return false; if (!comp_type_attributes (t1, t2)) - goto different_types; + return false; if (TYPE_ARG_TYPES (t1) == TYPE_ARG_TYPES (t2)) - goto same_types; + return true; else { tree parms1, parms2; @@ -4764,13 +4744,13 @@ gimple_canonical_types_compatible_p (tre (TREE_VALUE (parms1), TREE_VALUE (parms2)) && !gimple_canonical_types_compatible_p (TREE_VALUE (parms1), TREE_VALUE (parms2))) - goto different_types; + return false; } if (parms1 || parms2) - goto different_types; + return false; - goto same_types; + return true; } case RECORD_TYPE: @@ -4789,30 +4769,20 @@ gimple_canonical_types_compatible_p (tre || !gimple_compare_field_offset (f1, f2) || !gimple_canonical_types_compatible_p (TREE_TYPE (f1), TREE_TYPE (f2))) - goto different_types; + return false; } /* If one aggregate has more fields than the other, they are not the same. */ if (f1 || f2) - goto different_types; + return false; - goto same_types; + return true; } default: gcc_unreachable (); } - - /* Common exit path for types that are not compatible. */ -different_types: - p->same_p[GTC_DIAG] = 0; - return false; - - /* Common exit path for types that are compatible. */ -same_types: - p->same_p[GTC_DIAG] = 1; - return true; }