From patchwork Thu Oct 15 21:18:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Sidwell X-Patchwork-Id: 530896 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]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 1DEDF1402D5 for ; Fri, 16 Oct 2015 08:18:31 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=QpBTNXnh; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to :from:subject:message-id:date:mime-version:content-type; q=dns; s=default; b=jr/GROzHUshfCppJJTY1JqFkOKozAwjZBNWq4DLQgu+jSAfwAL ZOg+aFQT5FTMcaZEEL+I4zCTPGd8t8vpVFzpZdyGu3dy/6sjFOmw9O1t/9UHDcb9 xAsPvxsiUIL3JUURtRA+nsj9/QW12l5qt+N01aTz5PRH0XWBLWjO8tMEM= 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:to :from:subject:message-id:date:mime-version:content-type; s= default; bh=N1HBugX3aGMCLxNnVAju3g9Epno=; b=QpBTNXnhlw4nVOx1mKKG pNf7/4Ek9JZ8bYuiO2tBbXsQdvzU/L4pa2JcwjgfBOgwTTlq+GrCa6vHf8/eKQJP K4a7Wv8Ui/Dm55HO1/KjpeHA0dqad2hYcyVA6Mxk6gb2RZ+A/wpMVD1b16V6Rnbr jhOoFOFR/eHjo4NifpJ+zcY= Received: (qmail 126462 invoked by alias); 15 Oct 2015 21:18:24 -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 126448 invoked by uid 89); 15 Oct 2015 21:18:23 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=BAYES_00, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-qk0-f177.google.com Received: from mail-qk0-f177.google.com (HELO mail-qk0-f177.google.com) (209.85.220.177) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Thu, 15 Oct 2015 21:18:22 +0000 Received: by qkas79 with SMTP id s79so45970323qka.0 for ; Thu, 15 Oct 2015 14:18:20 -0700 (PDT) X-Received: by 10.55.40.224 with SMTP id o93mr14827958qko.106.1444943900453; Thu, 15 Oct 2015 14:18:20 -0700 (PDT) Received: from ?IPv6:2601:181:c000:c497:a2a8:cdff:fe3e:b48? ([2601:181:c000:c497:a2a8:cdff:fe3e:b48]) by smtp.googlemail.com with ESMTPSA id t48sm6258421qgd.15.2015.10.15.14.18.19 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Oct 2015 14:18:19 -0700 (PDT) To: GCC Patches , Cesar Philippidis From: Nathan Sidwell Subject: [gomp4] fix routine-7 test Message-ID: <5620181A.3000209@acm.org> Date: Thu, 15 Oct 2015 17:18:18 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 I've committed this to gomp4 branch. It fixes the routine-7 regression I caused when reworking the reduction machinery. nathan 2015-10-15 Nathan Sidwell * omp-low.c (lower_oacc_reductions): Check outer context is a target before lookup. Index: gcc/omp-low.c =================================================================== --- gcc/omp-low.c (revision 228848) +++ gcc/omp-low.c (working copy) @@ -4846,7 +4846,8 @@ lower_oacc_reductions (location_t loc, t /* This is the outermost construct with this reduction, see if there's a mapping for it. */ - if (maybe_lookup_field (orig, outer)) + if (gimple_code (outer->stmt) == GIMPLE_OMP_TARGET + && maybe_lookup_field (orig, outer)) ref_to_res = build_receiver_ref (orig, false, outer); has_outer_reduction:;