From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 56100 invoked by alias); 28 Oct 2015 14:59:28 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 56085 invoked by uid 89); 28 Oct 2015 14:59:27 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD,SPF_HELO_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Wed, 28 Oct 2015 14:59:26 +0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 490A68E256 for ; Wed, 28 Oct 2015 14:59:25 +0000 (UTC) Received: from brno.lan (ovpn01.gateway.prod.ext.ams2.redhat.com [10.39.146.11]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t9SExMoV026712 for ; Wed, 28 Oct 2015 10:59:24 -0400 From: Pedro Alves To: gdb-patches@sourceware.org Subject: [PATCH 1/7] compile: Rename struct type_map_instance::gcc_type field Date: Wed, 28 Oct 2015 16:55:00 -0000 Message-Id: <1446044362-8655-2-git-send-email-palves@redhat.com> In-Reply-To: <1446044362-8655-1-git-send-email-palves@redhat.com> References: <1446044362-8655-1-git-send-email-palves@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SW-Source: 2015-10/txt/msg00647.txt.bz2 Fixes: src/gdb/compile/compile-c-types.c:36:12: error: declaration of ‘gcc_type type_map_instance::gcc_type’ [-fpermissive] gcc_type gcc_type; ^ In file included from src/gdb/../include/gcc-c-interface.h:23:0, from src/gdb/compile/compile-internal.h:21, from src/gdb/compile/compile-c-types.c:23: src/gdb/../include/gcc-interface.h:32:28: error: changes meaning of ‘gcc_type’ from ‘typedef long long unsigned int gcc_type’ [-fpermissive] typedef unsigned long long gcc_type; ^ src/gdb/compile/compile-c-types.c: In function ‘gcc_type convert_qualified(compile_c_instance*, type*)’: src/gdb/compile/compile-c-types.c:310:19: error: invalid conversion from ‘int’ to ‘gcc_qualifiers’ [-fpermissive] quals); ^ gdb/ChangeLog: 2015-10-27 Pedro Alves * compile/compile-c-types.c (struct type_map_instance) : Rename to gcc_type_handle. (insert_type, convert_type): Adjust. --- gdb/compile/compile-c-types.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gdb/compile/compile-c-types.c b/gdb/compile/compile-c-types.c index 60f9bd4..ccc9167 100644 --- a/gdb/compile/compile-c-types.c +++ b/gdb/compile/compile-c-types.c @@ -31,7 +31,7 @@ struct type_map_instance /* The corresponding gcc type handle. */ - gcc_type gcc_type; + gcc_type gcc_type_handle; }; /* Hash a type_map_instance. */ @@ -72,13 +72,13 @@ insert_type (struct compile_c_instance *context, struct type *type, void **slot; inst.type = type; - inst.gcc_type = gcc_type; + inst.gcc_type_handle = gcc_type; slot = htab_find_slot (context->type_map, &inst, INSERT); add = (struct type_map_instance *) *slot; /* The type might have already been inserted in order to handle recursive types. */ - if (add != NULL && add->gcc_type != gcc_type) + if (add != NULL && add->gcc_type_handle != gcc_type) error (_("Unexpected type id from GCC, check you use recent enough GCC.")); if (add == NULL) @@ -388,7 +388,7 @@ convert_type (struct compile_c_instance *context, struct type *type) inst.type = type; found = (struct type_map_instance *) htab_find (context->type_map, &inst); if (found != NULL) - return found->gcc_type; + return found->gcc_type_handle; result = convert_type_basic (context, type); insert_type (context, type, result); -- 1.9.3