From patchwork Wed Dec 11 08:38:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frederik Harwath X-Patchwork-Id: 1207507 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-515676-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="nuClWZPx"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47Xr205rXrz9sNH for ; Wed, 11 Dec 2019 19:39:02 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :subject:from:to:cc:references:message-id:date:mime-version :in-reply-to:content-type; q=dns; s=default; b=LMDiowAQsNpvXJ5cs J4q7agKHi8i8cPHYz8KBD6slmLMS7Gig8ABuIjFqBuHgOHZlMZDx8vy3mQ+F06Xk cR+CiVqfZouR+RiFfBzTInobJjRXR/3Y4XlcVhTn3QfQ9PURJzYwj4iCe19ATMiI ePFYoDnftgLOSizCc05AILd17U= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :subject:from:to:cc:references:message-id:date:mime-version :in-reply-to:content-type; s=default; bh=oAn3jYZCririu5J/YOVn5PV rwSk=; b=nuClWZPxQlVLcdu3uoQFbis02ItrCtB8BhNK3xfWVKoRJdE0rxyDXxb eiekBXzcwiiV4hn2oVzhkpDzNC0bzQ+nbpzFMNTjZGgcIQduPHVmcnWOrJy5Jsoo moX3opC0ubHQJ55zUnvdsCX9fHTApdmGoXu3kDzTs+nVinNEFWkI= Received: (qmail 107825 invoked by alias); 11 Dec 2019 08:38:55 -0000 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 Received: (qmail 107812 invoked by uid 89); 11 Dec 2019 08:38:55 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-12.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_2, GIT_PATCH_3, KAM_ASCII_DIVIDERS autolearn=ham version=3.3.1 spammy= X-HELO: esa2.mentor.iphmx.com Received: from esa2.mentor.iphmx.com (HELO esa2.mentor.iphmx.com) (68.232.141.98) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 11 Dec 2019 08:38:54 +0000 IronPort-SDR: HhgZ4ls7CLxBtUddxH3OYH0ctQD5TjcZgmkVP3pKALh4z1G4MOcjPm/r+8SjSeqFnUuhvcwFPs l8ncuplCD8N67w5YgDmet9oHO+649pGGnCiPKRG/3XkJA+EV4q0zwgqfH35+UyrGv06JkYIDGu /NmGphS6CasBJUzELEVvhO7Ue8uN3rFaVvZsPKwzNUVFme+arvuOWnje1KLiLw7Qv4JgBGxQdv IgMRaLTn3oZ60UTgvIZe/7DZ295WcqXc/aytdNfuUz6ZsVYB6VxTqfIMrnSh7BYeL+ENdprJUR GGw= Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa2.mentor.iphmx.com with ESMTP; 11 Dec 2019 00:38:38 -0800 IronPort-SDR: GtWSLGXJb+W0rXYxMyO/CF2tSClTfxLnxAhU+8nqF4vrGGoIK4unsR9CFW0sColQohs5nRPeYu 1ShODkHkRWMvBXEQW8QggeeCmCCOmU9H5dMApCfq1x5avt+c7UsQs27i8LeYDFNcm2nw8VKUBn je+RosD4KpIz3NLp2FR0FnsvGaD81flCxlvjfayrEVPIjjZv0qhV4vCITH8D9I9K2S65cxjUhY vx2soyeaM36YixB8lvBLzVYZjSTD2/cufKg14vKbEdFii3LKflGj4QU7y+8au0tq+FB6HThGe3 vdI= Subject: [PATCH, committed] Fix PR92901: Change test expectation for C++ in OpenACC test clause-locations.c From: "Harwath, Frederik" To: Thomas Schwinge , CC: , References: <0624ce85-2ee7-38eb-d115-509d600d3f20@codesourcery.com> <20191210142303.9948-1-frederik@codesourcery.com> <17425c95-5819-7141-95cf-0abf934274d2@codesourcery.com> X-Pep-Version: 2.0 Message-ID: <174bb8d3-17f7-01ff-f6a8-5699b299b75d@codesourcery.com> Date: Wed, 11 Dec 2019 09:38:27 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.3.0 MIME-Version: 1.0 In-Reply-To: <17425c95-5819-7141-95cf-0abf934274d2@codesourcery.com> X-IsSubscribed: yes Hi, I have committed the attached trivial patch to trunk as r279215. The columns of the clause locations are reported differently by the C and C++ front-end and hence we need different test expectations for both languages. Best regards, Frederik ------------------------------------------------------------------------ r279215 | frederik | 2019-12-11 09:26:18 +0100 (Mi, 11 Dez 2019) | 12 lines Fix PR92901: Change test expectation for C++ in OpenACC test clause-locations.c The columns of the clause locations that are reported for C and C++ are different and hence we need separate test expectations for both languages. 2019-12-11 Frederik Harwath PR other/92901 /gcc/testsuite/ * c-c++-common/clause-locations.c: Adjust test expectation for C++. ------------------------------------------------------------------------ Index: gcc/testsuite/c-c++-common/goacc/clause-locations.c =================================================================== --- gcc/testsuite/c-c++-common/goacc/clause-locations.c (revision 279214) +++ gcc/testsuite/c-c++-common/goacc/clause-locations.c (working copy) @@ -9,7 +9,9 @@ #pragma acc loop reduction(+:sum) for (i = 1; i <= 10; i++) { - #pragma acc loop reduction(-:diff) reduction(-:sum) /* { dg-warning "53: conflicting reduction operations for .sum." } */ + #pragma acc loop reduction(-:diff) reduction(-:sum) + /* { dg-warning "53: conflicting reduction operations for .sum." "" { target c } .-1 } */ + /* { dg-warning "56: conflicting reduction operations for .sum." "" { target c++ } .-2 } */ for (j = 1; j <= 10; j++) sum = 1; }