From patchwork Tue Jun 4 00:15:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Modra X-Patchwork-Id: 1109575 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-502265-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="sFLNkouK"; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="LCJzxhjk"; 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 45Hsrt5HFJz9s6w for ; Tue, 4 Jun 2019 10:15:40 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:mime-version:content-type; q=dns; s=default; b=hrESBhAtPAhPEdoq2QikQmKRldFwEUgEtZELYdgEH2iEUZQbyL sn+aZmdo/R/OerMSYZ5kEo22nLNeXvqFMmnpAq2LIkTEGoq7I8j+JhSOYqXm0u4W RzPV/DC+BmWkL92BrzVDX5fsN2EH10h/zl2AsMDCW9UtEP8lWbj+ljXEc= 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:date :from:to:cc:subject:message-id:mime-version:content-type; s= default; bh=r6SXzbAPLzjVqAPSLk1iIRNoSjk=; b=sFLNkouKGrj0pzpkgCfy S+Qx9h/3fc2SOr64CK7wrrtEKSNEJi2QAvmr6kUR/uQ1FtWjQF2LaBU+pL6DjfTG 3IV+ZYIgCk4g3utrI+vj/wVafIsxgLfltvwrTInFUDtzKFLC2rFCe1JuaaXwOLp0 Hk0DVfThuoG4vlJkRj/8gM8= Received: (qmail 47614 invoked by alias); 4 Jun 2019 00:15:33 -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 47606 invoked by uid 89); 4 Jun 2019 00:15:33 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.4 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy=cookie, HX-Spam-Relays-External:209.85.214.195, H*RU:209.85.214.195, HX-HELO:sk:mail-pl X-HELO: mail-pl1-f195.google.com Received: from mail-pl1-f195.google.com (HELO mail-pl1-f195.google.com) (209.85.214.195) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 04 Jun 2019 00:15:31 +0000 Received: by mail-pl1-f195.google.com with SMTP id cl9so2489638plb.10 for ; Mon, 03 Jun 2019 17:15:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=Co4X3O0r9Juvz+HadgzCjdO9B9tbI/Qhe8MwJEs8qTc=; b=LCJzxhjkNkucCCpigvdiEN1a3wLHK/sMYjoqQREiaVTf1XUpoNcvZpJsoMNcCGNjen 5Eu2e1NjQGqZvwDiihN14SIIHltf8LV7hPhb5O2u8cLfNQsdOnkWP3Fw9szqV3NtcXOv 6lM81i1nFsVxtAGELZkv0FCBdNLrh4SJhfT/FucCIObkFTthZ3tDQM22ltZMwVkzsV0w LpbtvDUzZFXH0sG19z3JpusGDFG12qjkJvqy4o3Ft2qoZRaBO7Xincy5NOOH16obUqFD wFwsXjQHhK5FoFqXouvJiLF1q/2UowRqvmLyqiBjjeGygC8bP6gRDJZh2cgWaeEkEm8F cFlg== Received: from bubble.grove.modra.org (158.106.96.58.static.exetel.com.au. [58.96.106.158]) by smtp.gmail.com with ESMTPSA id m2sm13267693pgq.48.2019.06.03.17.15.28 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Jun 2019 17:15:29 -0700 (PDT) Received: by bubble.grove.modra.org (Postfix, from userid 1000) id 36EC4805CF; Tue, 4 Jun 2019 09:45:25 +0930 (ACST) Date: Tue, 4 Jun 2019 09:45:25 +0930 From: Alan Modra To: gcc-patches@gcc.gnu.org Cc: Segher Boessenkool Subject: PR90689, ICE in extract_insn on ppc64le Message-ID: <20190604001525.GA21461@bubble.grove.modra.org> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.9.4 (2018-02-28) X-IsSubscribed: yes I've committed this patch as an obvious fix to correct a merge error. PR target/90689 * config/rs6000/rs6000.c (rs6000_call_aix): Correct r271753 merge error. diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c index 3aa19db863c..95cf9d66017 100644 --- a/gcc/config/rs6000/rs6000.c +++ b/gcc/config/rs6000/rs6000.c @@ -37870,9 +37870,7 @@ rs6000_call_aix (rtx value, rtx func_desc, rtx tlsarg, rtx cookie) gen_rtx_PLUS (Pmode, stack_ptr, stack_toc_offset)); MEM_VOLATILE_P (stack_toc_mem) = 1; - if (HAVE_AS_PLTSEQ - && DEFAULT_ABI == ABI_ELFv2 - && GET_CODE (func_desc) == SYMBOL_REF) + if (is_pltseq_longcall) { rtvec v = gen_rtvec (3, toc_reg, func_desc, tlsarg); rtx mark_toc_reg = gen_rtx_UNSPEC (Pmode, v, UNSPEC_PLTSEQ);