From patchwork Fri Nov 2 23:17:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Lance Taylor X-Patchwork-Id: 196773 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 741832C00BE for ; Sat, 3 Nov 2012 10:17:20 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1352503042; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:From:To:Subject:Date:Message-ID:User-Agent:MIME-Version: Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:Sender:Delivered-To; bh=b+aqY7S NQ2tTzqr3WD/mRo0q1yU=; b=uHzaNVsi0Q3vH3SfiIu6IyMI5pNDlk1U4BAb/+/ Uqwxh6+Mc0UK9TWfNNc86qZ90Uf1WhJI1n/X6bgEO1sD9dp6MzJw5QoWQsy7K+5z 4Obocy0AzRgmrJ7dQptgosrZYeO3vVHFUpjck0z0tu4v5BUe/xJ+4dkaRl00KgoV WMCc= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:X-Google-DKIM-Signature:Received:Received:From:To:Subject:Date:Message-ID:User-Agent:MIME-Version:Content-Type:X-Gm-Message-State:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=tZRKLNus+YN1qFfr+2flfEM+TYXXTERNZMljBj/s2b3Bq356vjoqMZKh7TK3yH LzFM4wKVuSVhwx28tnpnUivwtV+HU+LZXkBQqJCoF0ByCPwjFteZTR3vS8apsqsr VRAePdffsoA3aJymvLIjYKdlFb4unuD5nPEAqeaHAm9+k=; Received: (qmail 13382 invoked by alias); 2 Nov 2012 23:17:17 -0000 Received: (qmail 13351 invoked by uid 22791); 2 Nov 2012 23:17:16 -0000 X-SWARE-Spam-Status: No, hits=-5.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, KHOP_RCVD_TRUST, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE, RP_MATCHES_RCVD, T_TVD_MIME_NO_HEADERS X-Spam-Check-By: sourceware.org Received: from mail-pa0-f47.google.com (HELO mail-pa0-f47.google.com) (209.85.220.47) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 02 Nov 2012 23:17:11 +0000 Received: by mail-pa0-f47.google.com with SMTP id fa11so2651623pad.20 for ; Fri, 02 Nov 2012 16:17:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:subject:date:message-id:user-agent:mime-version :content-type:x-gm-message-state; bh=C61wffBM40JpXVX62ufsxoigqpAGaZfnz0vVRvPo4Rg=; b=XbYjUoas6WQuNeaw/2jgvdjH+PRIuy7WbLSas4LO4CewBwSa1W/VI68kDSs29oufz9 6cP3V4b56bvvzNytJmYrryvMJPLU5Leh85A0Qwj7dIjsju8HcnwUjq7eNpG+TyxKUlOw gj9vLq1lPriMGzBHbE0ORLAT3QihcJt+MhdZjHzlgD176gc0fAFpxnO5nVhhVI5H5wYr L1OmE7uMpaa+Jzmx9pgllChCpnFfNP0CVN8uNEBCiGy7r3Fh4s8ruSwH1Rr8VuIHoAT8 zcmm65b9JIASNPmyEanx5rQewZ2uO67rL871JLQ5gi3o0Wo/FmhRjetbl2s+tjG1WP38 r9SQ== Received: by 10.66.79.133 with SMTP id j5mr9251865pax.51.1351898230651; Fri, 02 Nov 2012 16:17:10 -0700 (PDT) Received: from coign.google.com ([2620:0:1000:1804:224:d7ff:fe8f:f634]) by mx.google.com with ESMTPS id i10sm4049240paz.17.2012.11.02.16.17.09 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 02 Nov 2012 16:17:10 -0700 (PDT) From: Ian Lance Taylor To: gcc-patches@gcc.gnu.org, gofrontend-dev@googlegroups.com Subject: libgo patch committed: Fix reflect.Call Date: Fri, 02 Nov 2012 16:17:08 -0700 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) MIME-Version: 1.0 X-Gm-Message-State: ALoCoQnK0hGE+Y+HP3thPo4yi9K08FqVjoZmWQbJZ5d6ur7cSTqWXg6djX3PSR2JwXgdbtTKsoqg+8JjOp83XThe66xuN/P2h7Auvm64YRjTcCfTwGIVt//0qcd7WyC468e53jB3uocqYDzzAxh+YbEmwydIBs3hDoXFdkHg+SkAwMez8RoXxsYtXYf5O5YX4QTHWlA47gUf X-IsSubscribed: yes 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 Part of my initial 64-bit support patch was bogus: I shadowed a variable in a couple of functions used for reflect.Call. This patch fixes it. Bootstrapped and ran Go testsuite on x86_64-unknown-linux-gnu. Committed to mainline. Ian diff -r cecca11207b7 libgo/runtime/go-reflect-call.c --- a/libgo/runtime/go-reflect-call.c Thu Nov 01 14:42:39 2012 -0700 +++ b/libgo/runtime/go-reflect-call.c Fri Nov 02 16:15:20 2012 -0700 @@ -75,15 +75,15 @@ const struct __go_slice_type *descriptor __attribute__ ((unused))) { ffi_type *ret; - ffi_type *intgo; + ffi_type *ffi_intgo; ret = (ffi_type *) __go_alloc (sizeof (ffi_type)); ret->type = FFI_TYPE_STRUCT; ret->elements = (ffi_type **) __go_alloc (4 * sizeof (ffi_type *)); ret->elements[0] = &ffi_type_pointer; - intgo = sizeof (intgo) == 4 ? &ffi_type_sint32 : &ffi_type_sint64; - ret->elements[1] = intgo; - ret->elements[2] = intgo; + ffi_intgo = sizeof (intgo) == 4 ? &ffi_type_sint32 : &ffi_type_sint64; + ret->elements[1] = ffi_intgo; + ret->elements[2] = ffi_intgo; ret->elements[3] = NULL; return ret; } @@ -117,14 +117,14 @@ go_string_to_ffi (void) { ffi_type *ret; - ffi_type *intgo; + ffi_type *ffi_intgo; ret = (ffi_type *) __go_alloc (sizeof (ffi_type)); ret->type = FFI_TYPE_STRUCT; ret->elements = (ffi_type **) __go_alloc (3 * sizeof (ffi_type *)); ret->elements[0] = &ffi_type_pointer; - intgo = sizeof (intgo) == 4 ? &ffi_type_sint32 : &ffi_type_sint64; - ret->elements[1] = intgo; + ffi_intgo = sizeof (intgo) == 4 ? &ffi_type_sint32 : &ffi_type_sint64; + ret->elements[1] = ffi_intgo; ret->elements[2] = NULL; return ret; }