From patchwork Tue Mar 6 12:09:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Botcazou X-Patchwork-Id: 882028 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-474325-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=adacore.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="a6vDs1JD"; 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 3zwbDt3RkGz9sgh for ; Tue, 6 Mar 2018 23:09:49 +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:from :to:subject:date:message-id:mime-version:content-type :content-transfer-encoding; q=dns; s=default; b=w7K74NrKGNhrpfEJ JHHroATD3u6+YA2iNe7pA0DdZfSVKyL7Jz5uD5Lt/oYKiaIDDFYkA6Fm8lWFat3Y lKZ0dqwaVxopMg38tqVZz1wLDw0sR9O/HdqGZgBCsdX9X8GtS/5UvUM4uIMk8UtU GNip6IqBGb12Fh1FJGRSEnyTt0w= 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:from :to:subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=default; bh=H59ihi19AfSx/s/TfYk7ls 60KyM=; b=a6vDs1JDpUy00r/Fzm+MT6/eJfCP+bMR9Yqhb729fQgJJ0AD0/TPx4 W8gpWnD/b+QQJI7moH8gr+U7DJhdG4u2yMoivkrtDmB3smgB/7JmOz4kbLf1nGFJ sQu5eVjcSE156I1z1/rF0X8Y9v7zC00t8mdBalhAbsbnJfxmy2984= Received: (qmail 97226 invoked by alias); 6 Mar 2018 12:09:42 -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 97215 invoked by uid 89); 6 Mar 2018 12:09:42 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-11.0 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: smtp.eu.adacore.com Received: from mel.act-europe.fr (HELO smtp.eu.adacore.com) (194.98.77.210) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 06 Mar 2018 12:09:40 +0000 Received: from localhost (localhost [127.0.0.1]) by filtered-smtp.eu.adacore.com (Postfix) with ESMTP id 3290C8139C for ; Tue, 6 Mar 2018 13:09:38 +0100 (CET) Received: from smtp.eu.adacore.com ([127.0.0.1]) by localhost (smtp.eu.adacore.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id S4L0wggms4fL for ; Tue, 6 Mar 2018 13:09:38 +0100 (CET) Received: from polaris.localnet (bon31-6-88-161-99-133.fbx.proxad.net [88.161.99.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.eu.adacore.com (Postfix) with ESMTPSA id 16A4181398 for ; Tue, 6 Mar 2018 13:09:38 +0100 (CET) From: Eric Botcazou To: gcc-patches@gcc.gnu.org Subject: [Ada] Fix build on x86/Windows Date: Tue, 06 Mar 2018 13:09:35 +0100 Message-ID: <6759955.K2KhvahMho@polaris> MIME-Version: 1.0 It has been broken on the mainline since end of December. The attached patchlet is copy-and-pasted from the same function in the c-family dir. Tested on x86/Windows and x86-64/Linux, applied on the mainline. 2018-03-06 Eric Botcazou * gcc-interface/utils.c (def_builtin_1): Bail out on error_mark_node. Index: gcc-interface/utils.c =================================================================== --- gcc-interface/utils.c (revision 258231) +++ gcc-interface/utils.c (working copy) @@ -6443,6 +6443,9 @@ def_builtin_1 (enum built_in_function fn if (builtin_decl_explicit (fncode)) return; + if (fntype == error_mark_node) + return; + gcc_assert ((!both_p && !fallback_p) || !strncmp (name, "__builtin_", strlen ("__builtin_")));