From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 9191 invoked by alias); 5 Apr 2011 00:51:17 -0000 Received: (qmail 9180 invoked by uid 22791); 5 Apr 2011 00:51:15 -0000 X-SWARE-Spam-Status: No, hits=-2.3 required=5.0 tests=AWL,BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW X-Spam-Check-By: sourceware.org Received: from mail-px0-f176.google.com (HELO mail-px0-f176.google.com) (209.85.212.176) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 05 Apr 2011 00:51:09 +0000 Received: by pxi11 with SMTP id 11so1978187pxi.21 for ; Mon, 04 Apr 2011 17:51:08 -0700 (PDT) MIME-Version: 1.0 Received: by 10.142.2.3 with SMTP id 3mr7385316wfb.172.1301964668640; Mon, 04 Apr 2011 17:51:08 -0700 (PDT) Received: by 10.68.54.138 with HTTP; Mon, 4 Apr 2011 17:51:08 -0700 (PDT) Date: Tue, 05 Apr 2011 00:51:00 -0000 Message-ID: Subject: PATCH: PR middle-end/48440: [4.7 Regression] FAIL: gcc.c-torture/compile/labels-3.c From: "H.J. Lu" To: Michael Matz Cc: Richard Guenther , Paolo Bonzini , gcc-patches@gcc.gnu.org Content-Type: multipart/mixed; boundary=00504502b277959d1004a0214546 X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org X-SW-Source: 2011-04/txt/msg00281.txt.bz2 --00504502b277959d1004a0214546 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Content-length: 2134 On Mon, Apr 4, 2011 at 3:00 PM, H.J. Lu wrote: > On Sun, Apr 3, 2011 at 3:14 AM, Michael Matz wrote: >> Hi, >> >> On Thu, 31 Mar 2011, Richard Guenther wrote: >> >>> > In the meanwhile, is the below version okay? >>> >>> If it bootstraps & tests ok then yes. =A0The java parts look obvious. >> >> So, we indeed can't remove the other calls to >> canonicalize_constructor_val, because of local ctors. =A0And fortran has= a >> similar problem with java. =A0Instead of fixing up all these places of >> resetting cfun (where otherwise the frontends don't deal at all with it, >> it's mostly just set from the various cgraph routines), I decided to >> simply clear this at the appropriate place in >> cgraph_finalize_compilation_unit. >> >> Regstrapping in progress again. =A0Still okay if that works? >> >> >> Ciao, >> Michael. >> -- >> =A0 =A0 =A0 =A0* cgraphbuild.c (record_reference): Canonicalize construc= tor >> =A0 =A0 =A0 =A0values. > >> >> Index: cgraphbuild.c >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >> --- cgraphbuild.c.orig =A02011-04-03 11:28:45.000000000 +0200 >> +++ cgraphbuild.c =A0 =A0 =A0 2011-04-03 11:31:21.000000000 +0200 >> @@ -53,6 +53,12 @@ record_reference (tree *tp, int *walk_su >> =A0 tree decl; >> =A0 struct record_reference_ctx *ctx =3D (struct record_reference_ctx *)= data; >> >> + =A0t =3D canonicalize_constructor_val (t); >> + =A0if (!t) >> + =A0 =A0t =3D *tp; >> + =A0else if (t !=3D *tp) >> + =A0 =A0*tp =3D t; >> + >> =A0 switch (TREE_CODE (t)) >> =A0 =A0 { >> =A0 =A0 case VAR_DECL: > > This change caused: > > http://gcc.gnu.org/bugzilla/show_bug.cgi?id=3D48440 > This avoids canonicalizing constructor values for address conversion if Pmode !=3D ptr_mode. OK for trunk? Thanks. --=20 H.J. ---- 2011-04-04 H.J. Lu PR middle-end/48440 * cgraphbuild.c (record_reference): Don't canonicalize constructor values for address conversion if Pmode !=3D ptr_mode. --00504502b277959d1004a0214546 Content-Type: text/plain; charset=US-ASCII; name="gcc-pr48440-1.patch" Content-Disposition: attachment; filename="gcc-pr48440-1.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gm4432zp0 Content-length: 1261 MjAxMS0wNC0wNCAgSC5KLiBMdSAgPGhvbmdqaXUubHVAaW50ZWwuY29tPgoK CVBSIG1pZGRsZS1lbmQvNDg0NDAKCSogY2dyYXBoYnVpbGQuYyAocmVjb3Jk X3JlZmVyZW5jZSk6IERvbid0IGNhbm9uaWNhbGl6ZSBjb25zdHJ1Y3RvcgoJ dmFsdWVzIGZvciBhZGRyZXNzIGNvbnZlcnNpb24gaWYgUG1vZGUgIT0gcHRy X21vZGUuCgpkaWZmIC0tZ2l0IGEvZ2NjL2NncmFwaGJ1aWxkLmMgYi9nY2Mv Y2dyYXBoYnVpbGQuYwppbmRleCAzOTQ4Y2Y2Li44YmE3ODY0IDEwMDY0NAot LS0gYS9nY2MvY2dyYXBoYnVpbGQuYworKysgYi9nY2MvY2dyYXBoYnVpbGQu YwpAQCAtNDksMTUgKzQ5LDIwIEBAIHN0cnVjdCByZWNvcmRfcmVmZXJlbmNl X2N0eAogc3RhdGljIHRyZWUKIHJlY29yZF9yZWZlcmVuY2UgKHRyZWUgKnRw LCBpbnQgKndhbGtfc3VidHJlZXMsIHZvaWQgKmRhdGEpCiB7Ci0gIHRyZWUg dCA9ICp0cDsKKyAgdHJlZSB0ID0gKnRwLCB0YzsKICAgdHJlZSBkZWNsOwog ICBzdHJ1Y3QgcmVjb3JkX3JlZmVyZW5jZV9jdHggKmN0eCA9IChzdHJ1Y3Qg cmVjb3JkX3JlZmVyZW5jZV9jdHggKilkYXRhOwogCi0gIHQgPSBjYW5vbmlj YWxpemVfY29uc3RydWN0b3JfdmFsICh0KTsKLSAgaWYgKCF0KQotICAgIHQg PSAqdHA7Ci0gIGVsc2UgaWYgKHQgIT0gKnRwKQotICAgICp0cCA9IHQ7Cisg IHRjID0gY2Fub25pY2FsaXplX2NvbnN0cnVjdG9yX3ZhbCAodCk7CisgIGlm ICh0YworICAgICAgJiYgdGMgIT0gdAorICAgICAgJiYgIShQbW9kZSAhPSBw dHJfbW9kZQorCSAgICYmIFRSRUVfQ09ERSAodGMpID09IEFERFJfRVhQUgor CSAgICYmIFRSRUVfQ09ERSAodCkgPT0gQ09OVkVSVF9FWFBSKSkKKyAgICB7 CisgICAgICAqdHAgPSB0YzsKKyAgICAgIHQgPSB0YzsKKyAgICB9CiAKICAg c3dpdGNoIChUUkVFX0NPREUgKHQpKQogICAgIHsK --00504502b277959d1004a0214546--