From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gcc-patches-return-333089-listarch-gcc-patches=gcc.gnu.org@gcc.gnu.org>
Received: (qmail 2267 invoked by alias); 29 Nov 2012 12:03:11 -0000
Received: (qmail 2253 invoked by uid 22791); 29 Nov 2012 12:03:10 -0000
X-SWARE-Spam-Status: No, hits=-3.1 required=5.0	tests=AWL,BAYES_00,DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM,KHOP_RCVD_TRUST,NML_ADSP_CUSTOM_MED,RCVD_IN_DNSWL_LOW,RCVD_IN_HOSTKARMA_YE
X-Spam-Check-By: sourceware.org
Received: from mail-wi0-f175.google.com (HELO mail-wi0-f175.google.com) (209.85.212.175)    by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 29 Nov 2012 12:03:06 +0000
Received: by mail-wi0-f175.google.com with SMTP id hm11so5098516wib.8        for <gcc-patches@gcc.gnu.org>; Thu, 29 Nov 2012 04:03:04 -0800 (PST)
MIME-Version: 1.0
Received: by 10.180.14.162 with SMTP id q2mr38121920wic.21.1354190584886; Thu, 29 Nov 2012 04:03:04 -0800 (PST)
Received: by 10.216.153.132 with HTTP; Thu, 29 Nov 2012 04:03:04 -0800 (PST)
Date: Thu, 29 Nov 2012 12:03:00 -0000
Message-ID: <CAEwic4YFOVyfQ8r-gsKTGMxOBEjKUSkTRx4phY6UPPgHOFCK4w@mail.gmail.com>
Subject: [patch c++]: 1 of 7 Fix for PR target/53912 bootstrap fails using default c++ mode in stage 2 and 3 for native x86_64-w64-mingw32
From: Kai Tietz <ktietz70@googlemail.com>
To: GCC Patches <gcc-patches@gcc.gnu.org>
Cc: Jason Merrill <jason@redhat.com>
Content-Type: text/plain; charset=ISO-8859-1
X-IsSubscribed: yes
Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
List-Id: <gcc-patches.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
X-SW-Source: 2012-11/txt/msg02411.txt.bz2

Hello,

this trivial patch fixes a bootstrap issue on LLP64 hosts.

	cp/
	
	PR target/53912
	* class.c (dump_class_hierarchy_r): Cast from pointer via uintptr_t.
	(dump_vtable): Likewise.

Tested for i686-w64-mingw32, x86_64-w64-mingw32, and
x86_64-unknown-gnu-linux. Ok for apply?

Regards,
Kai

Index: cp/class.c
===================================================================
--- cp/class.c  (Revision 193925)
+++ cp/class.c  (Arbeitskopie)
@@ -7817,7 +7817,7 @@ dump_class_hierarchy_r (FILE *stream,
   indented = maybe_indent_hierarchy (stream, indent, 0);
   fprintf (stream, "%s (0x%lx) ",
           type_as_string (BINFO_TYPE (binfo), TFF_PLAIN_IDENTIFIER),
-          (unsigned long) binfo);
+          (unsigned long) (uintptr_t) binfo);
   if (binfo != igo)
     {
       fprintf (stream, "alternative-path\n");
@@ -7842,7 +7842,7 @@ dump_class_hierarchy_r (FILE *stream,
       fprintf (stream, " primary-for %s (0x%lx)",
               type_as_string (BINFO_TYPE (BINFO_INHERITANCE_CHAIN (binfo)),
                               TFF_PLAIN_IDENTIFIER),
-              (unsigned long)BINFO_INHERITANCE_CHAIN (binfo));
+              (unsigned long) (uintptr_t) BINFO_INHERITANCE_CHAIN (binfo));
     }
   if (BINFO_LOST_PRIMARY_P (binfo))
     {
@@ -7975,7 +7975,8 @@ dump_vtable (tree t, tree binfo, tree vtable)
       if (ctor_vtbl_p)
        {
          if (!BINFO_VIRTUAL_P (binfo))
-           fprintf (stream, " (0x%lx instance)", (unsigned long)binfo);
+           fprintf (stream, " (0x%lx instance)", (unsigned long)
+                    (uintptr_t) binfo);
          fprintf (stream, " in %s", type_as_string (t, TFF_PLAIN_IDENTIFIER));
        }
       fprintf (stream, "\n");