From patchwork Fri May 27 12:35:06 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Baldwin X-Patchwork-Id: 97676 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 325C1B6F90 for ; Fri, 27 May 2011 22:35:31 +1000 (EST) Received: (qmail 23435 invoked by alias); 27 May 2011 12:35:29 -0000 Received: (qmail 23290 invoked by uid 22791); 27 May 2011 12:35:28 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, SPF_HELO_PASS, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from smtp-out.google.com (HELO smtp-out.google.com) (74.125.121.67) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 27 May 2011 12:35:10 +0000 Received: from hpaq13.eem.corp.google.com (hpaq13.eem.corp.google.com [172.25.149.13]) by smtp-out.google.com with ESMTP id p4RCZ8j0024513 for ; Fri, 27 May 2011 05:35:09 -0700 Received: from topo.tor.corp.google.com (topo.tor.corp.google.com [172.29.41.2]) by hpaq13.eem.corp.google.com with ESMTP id p4RCZ6gY013179; Fri, 27 May 2011 05:35:07 -0700 Received: by topo.tor.corp.google.com (Postfix, from userid 9603) id 5151A1DA1CA; Fri, 27 May 2011 08:35:06 -0400 (EDT) To: aaw@google.com, gcc-patches@gcc.gnu.org Subject: [google/integration] Fix testsuite error introduced in r174121 Cc: c@google.com Message-Id: <20110527123506.5151A1DA1CA@topo.tor.corp.google.com> Date: Fri, 27 May 2011 08:35:06 -0400 (EDT) From: simonb@google.com (Simon Baldwin) 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-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Fix testsuite error introduced in r174121. r174121 introduces a new warn_self_assign options variable that conflicts with a static function in gcc/testsuite/g{cc,++}.dg/plugin/selfassign.c. Import a small portion of r172992 to avoid the problem. Okay for google/integration? gcc/testsuite/ChangeLog.google-integration: 2011-05-27 Simon Baldwin * testsuite/gcc.dg/plugin/selfassign.c (check_self_assign): Renamed from warn_self_assign. (execute_warn_self_assign): Call a function by its new name. * testsuite/g++.dg/plugin/selfassign.c (check_self_assign): Renamed from warn_self_assign. (execute_warn_self_assign): Call a function by its new name. Index: gcc/testsuite/gcc.dg/plugin/selfassign.c =================================================================== --- gcc/testsuite/gcc.dg/plugin/selfassign.c (revision 174121) +++ gcc/testsuite/gcc.dg/plugin/selfassign.c (working copy) @@ -194,7 +194,7 @@ compare_and_warn (gimple stmt, tree lhs, /* Check and warn if STMT is a self-assign statement. */ static void -warn_self_assign (gimple stmt) +check_self_assign (gimple stmt) { tree rhs, lhs; @@ -247,7 +247,7 @@ execute_warn_self_assign (void) FOR_EACH_BB (bb) { for (gsi = gsi_start_bb (bb); !gsi_end_p (gsi); gsi_next (&gsi)) - warn_self_assign (gsi_stmt (gsi)); + check_self_assign (gsi_stmt (gsi)); } return 0; Index: gcc/testsuite/g++.dg/plugin/selfassign.c =================================================================== --- gcc/testsuite/g++.dg/plugin/selfassign.c (revision 174121) +++ gcc/testsuite/g++.dg/plugin/selfassign.c (working copy) @@ -194,7 +194,7 @@ compare_and_warn (gimple stmt, tree lhs, /* Check and warn if STMT is a self-assign statement. */ static void -warn_self_assign (gimple stmt) +check_self_assign (gimple stmt) { tree rhs, lhs; @@ -247,7 +247,7 @@ execute_warn_self_assign (void) FOR_EACH_BB (bb) { for (gsi = gsi_start_bb (bb); !gsi_end_p (gsi); gsi_next (&gsi)) - warn_self_assign (gsi_stmt (gsi)); + check_self_assign (gsi_stmt (gsi)); } return 0;