From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 25062 invoked by alias); 27 Jun 2011 16:22:11 -0000 Received: (qmail 25040 invoked by uid 22791); 27 Jun 2011 16:22:09 -0000 X-SWARE-Spam-Status: No, hits=-0.7 required=5.0 tests=AWL,BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,SARE_OBFU_PART_CIA,SPF_HELO_PASS,T_RP_MATCHES_RCVD,URI_HEX X-Spam-Check-By: sourceware.org Received: from smtp-out.google.com (HELO smtp-out.google.com) (216.239.44.51) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 27 Jun 2011 16:21:48 +0000 Received: from hpaq3.eem.corp.google.com (hpaq3.eem.corp.google.com [172.25.149.3]) by smtp-out.google.com with ESMTP id p5RGLkh5012920; Mon, 27 Jun 2011 09:21:46 -0700 Received: from topo.tor.corp.google.com (topo.tor.corp.google.com [172.29.41.2]) by hpaq3.eem.corp.google.com with ESMTP id p5RGLclR018951; Mon, 27 Jun 2011 09:21:39 -0700 Received: by topo.tor.corp.google.com (Postfix, from userid 54752) id 346051DA195; Mon, 27 Jun 2011 12:21:38 -0400 (EDT) To: reply@codereview.appspotmail.com, crowl@google.com, gchare@google.com, gcc-patches@gcc.gnu.org Subject: [pph] Add header files to pph.map (issue4639073) Message-Id: <20110627162138.346051DA195@topo.tor.corp.google.com> Date: Mon, 27 Jun 2011 16:48:00 -0000 From: dnovillo@google.com (Diego Novillo) X-System-Of-Record: true 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-06/txt/msg02011.txt.bz2 When I added these tests, I forgot to add them to pph.map, so the header files were being generated into an image, but not used in the second compilation. Most of the failures are in the form of different asm output. There is one new ICE, though. Committed to branch. Diego. * g++.dg/pph/pph.map: Add entries for c120060625-1.cc, c1attr-warn-unused-result.cc, c1builtin-integral-1.cc, c1builtin-object-size-2.cc, c1eabi1.cc, c1eabi1.h, c1limits-externalid.cc, c1meteor-contest.cc, c1pr36533.cc, c1pr44948-1a.cc, c1return-5.cc, and x1template.cc. * g++.dg/pph/c120060625-1.cc: Adjust XFAIL patterns. * g++.dg/pph/c1attr-warn-unused-result.cc: Adjust XFAIL patterns. * g++.dg/pph/c1builtin-integral-1.cc: Adjust XFAIL patterns. * g++.dg/pph/c1builtin-object-size-2.cc: Adjust XFAIL patterns. * g++.dg/pph/c1eabi1.cc: Adjust XFAIL patterns. * g++.dg/pph/c1eabi1.h: Adjust XFAIL patterns. * g++.dg/pph/c1limits-externalid.cc: Adjust XFAIL patterns. * g++.dg/pph/c1meteor-contest.cc: Adjust XFAIL patterns. * g++.dg/pph/c1pr36533.cc: Adjust XFAIL patterns. * g++.dg/pph/c1pr44948-1a.cc: Adjust XFAIL patterns. * g++.dg/pph/c1return-5.cc: Adjust XFAIL patterns. * g++.dg/pph/x1template.cc: Adjust XFAIL patterns. diff --git a/gcc/testsuite/g++.dg/pph/c120060625-1.cc b/gcc/testsuite/g++.dg/pph/c120060625-1.cc index 05c7929..d09be39 100644 --- a/gcc/testsuite/g++.dg/pph/c120060625-1.cc +++ b/gcc/testsuite/g++.dg/pph/c120060625-1.cc @@ -1 +1,2 @@ +// pph asm xdiff #include "c120060625-1.h" diff --git a/gcc/testsuite/g++.dg/pph/c1attr-warn-unused-result.cc b/gcc/testsuite/g++.dg/pph/c1attr-warn-unused-result.cc index 921d294..da75561 100644 --- a/gcc/testsuite/g++.dg/pph/c1attr-warn-unused-result.cc +++ b/gcc/testsuite/g++.dg/pph/c1attr-warn-unused-result.cc @@ -1,2 +1,3 @@ /* { dg-options "-w" } */ +// pph asm xdiff #include "c1attr-warn-unused-result.h" diff --git a/gcc/testsuite/g++.dg/pph/c1builtin-integral-1.cc b/gcc/testsuite/g++.dg/pph/c1builtin-integral-1.cc index bf53219..962086c 100644 --- a/gcc/testsuite/g++.dg/pph/c1builtin-integral-1.cc +++ b/gcc/testsuite/g++.dg/pph/c1builtin-integral-1.cc @@ -1 +1,2 @@ +// pph asm xdiff #include "c1builtin-integral-1.h" diff --git a/gcc/testsuite/g++.dg/pph/c1builtin-object-size-2.cc b/gcc/testsuite/g++.dg/pph/c1builtin-object-size-2.cc index 615e7da..17fe707 100644 --- a/gcc/testsuite/g++.dg/pph/c1builtin-object-size-2.cc +++ b/gcc/testsuite/g++.dg/pph/c1builtin-object-size-2.cc @@ -1,2 +1,3 @@ /* { dg-options "-O2 -w -fpermissive" } */ +// pph asm xdiff #include "c1builtin-object-size-2.h" diff --git a/gcc/testsuite/g++.dg/pph/c1eabi1.cc b/gcc/testsuite/g++.dg/pph/c1eabi1.cc index b2e9b11..07a3a8b 100644 --- a/gcc/testsuite/g++.dg/pph/c1eabi1.cc +++ b/gcc/testsuite/g++.dg/pph/c1eabi1.cc @@ -1,3 +1,4 @@ +// { dg-timeout 2 { target *-*-* } } // { dg-options "-w -fpermissive" } // pph asm xdiff diff --git a/gcc/testsuite/g++.dg/pph/c1eabi1.h b/gcc/testsuite/g++.dg/pph/c1eabi1.h index 5f5b593..383b752 100644 --- a/gcc/testsuite/g++.dg/pph/c1eabi1.h +++ b/gcc/testsuite/g++.dg/pph/c1eabi1.h @@ -1,4 +1,6 @@ // { dg-options "-w -fpermissive" } +// FIXME pph - Enabling PPH for this file causes memory problems in cc1plus. +// c1eabi1.h c1eabi1.pph #ifndef __PPH_GUARD_H #define __PPH_GUARD_H diff --git a/gcc/testsuite/g++.dg/pph/c1limits-externalid.cc b/gcc/testsuite/g++.dg/pph/c1limits-externalid.cc index 8b5039c..8d2da40 100644 --- a/gcc/testsuite/g++.dg/pph/c1limits-externalid.cc +++ b/gcc/testsuite/g++.dg/pph/c1limits-externalid.cc @@ -1 +1,2 @@ +// pph asm xdiff #include "c1limits-externalid.h" diff --git a/gcc/testsuite/g++.dg/pph/c1meteor-contest.cc b/gcc/testsuite/g++.dg/pph/c1meteor-contest.cc index bb097ac..58d2c89 100644 --- a/gcc/testsuite/g++.dg/pph/c1meteor-contest.cc +++ b/gcc/testsuite/g++.dg/pph/c1meteor-contest.cc @@ -1,2 +1,4 @@ +/* { dg-timeout 5 { target *-*-* } } */ +// { dg-xfail-if "INFINITE" { "*-*-*" } { "-fpph-map=pph.map" } } /* { dg-options "-w" } */ #include "c1meteor-contest.h" diff --git a/gcc/testsuite/g++.dg/pph/c1pr36533.cc b/gcc/testsuite/g++.dg/pph/c1pr36533.cc index b44e8c9..d8d6d8c 100644 --- a/gcc/testsuite/g++.dg/pph/c1pr36533.cc +++ b/gcc/testsuite/g++.dg/pph/c1pr36533.cc @@ -1,2 +1,3 @@ /* { dg-options "-w -fpermissive" } */ +// pph asm xdiff #include "c1pr36533.h" diff --git a/gcc/testsuite/g++.dg/pph/c1pr44948-1a.cc b/gcc/testsuite/g++.dg/pph/c1pr44948-1a.cc index f3f0427..d2ebd27 100644 --- a/gcc/testsuite/g++.dg/pph/c1pr44948-1a.cc +++ b/gcc/testsuite/g++.dg/pph/c1pr44948-1a.cc @@ -1 +1,3 @@ +// { dg-xfail-if "INFINITE" { "*-*-*" } { "-fpph-map=pph.map" } } +// { dg-bogus "internal compiler error: in lto_streamer_cache_get, at lto-streamer.c" "" { xfail *-*-* } 0 } #include "c1pr44948-1a.h" diff --git a/gcc/testsuite/g++.dg/pph/c1return-5.cc b/gcc/testsuite/g++.dg/pph/c1return-5.cc index a29c8a9..aa7dfe4 100644 --- a/gcc/testsuite/g++.dg/pph/c1return-5.cc +++ b/gcc/testsuite/g++.dg/pph/c1return-5.cc @@ -1,4 +1,5 @@ // { dg-options "-mpreferred-stack-boundary=4" } // { dg-final { scan-assembler-not "and\[lq\]?\[^\\n\]*-64,\[^\\n\]*sp" } } +// pph asm xdiff #include "c1return-5.h" diff --git a/gcc/testsuite/g++.dg/pph/pph.map b/gcc/testsuite/g++.dg/pph/pph.map index f0c7abd..2735af8 100644 --- a/gcc/testsuite/g++.dg/pph/pph.map +++ b/gcc/testsuite/g++.dg/pph/pph.map @@ -1,5 +1,9 @@ +c120060625-1.h c120060625-1.pph c1altinc1.h c1altinc1.pph c1altinc2.h c1altinc2.pph +c1attr-warn-unused-result.h c1attr-warn-unused-result.pph +c1builtin-integral-1.h c1builtin-integral-1.pph +c1builtin-object-size-2.h c1builtin-object-size-2.pph c1chained1.h c1chained1.pph c1chained2.h c1chained2.pph c1empty.h c1empty.pph @@ -9,8 +13,13 @@ c1functions.h c1functions.pph c1guarded1.h c1guarded1.pph c1guarded2.h c1guarded2.pph c1guarded3.h c1guarded3.pph +c1limits-externalid.h c1limits-externalid.pph +c1meteor-contest.h c1meteor-contest.pph c1multinc1.h c1multinc1.pph c1multinc2.h c1multinc2.pph +c1pr36533.h c1pr36533.pph +c1pr44948-1a.h c1pr44948-1a.pph +c1return-5.h c1return-5.pph c1simple1.h c1simple1.pph c1simple2.h c1simple2.pph c1struct.h c1struct.pph diff --git a/gcc/testsuite/g++.dg/pph/x1template.cc b/gcc/testsuite/g++.dg/pph/x1template.cc index cecefd7..95ad779 100644 --- a/gcc/testsuite/g++.dg/pph/x1template.cc +++ b/gcc/testsuite/g++.dg/pph/x1template.cc @@ -1,5 +1,5 @@ // { dg-xfail-if "ICE" { "*-*-*" } { "-fpph-map=pph.map" } } -// { dg-bogus "x1template.h:18:13: internal compiler error: in resume_scope, at cp/name-lookup.c:1568" "" { xfail *-*-* } 0 } +// { dg-bogus "x1template.h:18:13: internal compiler error: in resume_scope" "" { xfail *-*-* } 0 } // { dg-prune-output "In file included from " } #include "x1template.h" -- This patch is available for review at http://codereview.appspot.com/4639073