From patchwork Mon Oct 22 10:45:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Botcazou X-Patchwork-Id: 987576 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-488012-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="LyGQ3Dsg"; 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 42dtbY4JBCz9sDC for ; Mon, 22 Oct 2018 21:50:47 +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=LmtSK0u45n8cUGs1 /t2BmAxOhQM3pZTmJYMVmV/E6RELfyY2uM910u9XQ17bNgZBmEBy61Ww90/wzUgb R7fPv7UskemSIExPZxOOTpxBUF6FVKLU9zSGZxCNexJBAAzG3G5BjSMKvha0qVcp bWIabB6kTiQ6HWwQnmvhGfGgfxc= 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=+b4Iw3ow/uvrBUTh/4sfma 95NHI=; b=LyGQ3Dsgp6ly4GbhWoK3pBctWXzotXkx2CEArhK6S2YlaAxzuOqBgM Law31RUrgYYSlBopMnBonSVt6H/VtbjHJVdcUDqJMY4kZaPUsHwKaMffL84920XH a2PMg1+vRQBFtQDZWAS2MFUQRBnW5Aa8EOmyqV7AsKclzYOYc286M= Received: (qmail 125254 invoked by alias); 22 Oct 2018 10:49:14 -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 120293 invoked by uid 89); 22 Oct 2018 10:45:31 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-11.1 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=spurious, sk:pragma_, gccinterface, Hx-languages-length:2082 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; Mon, 22 Oct 2018 10:45:25 +0000 Received: from localhost (localhost [127.0.0.1]) by filtered-smtp.eu.adacore.com (Postfix) with ESMTP id 85A3781387 for ; Mon, 22 Oct 2018 12:45:19 +0200 (CEST) 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 198R0afnOidX for ; Mon, 22 Oct 2018 12:45:19 +0200 (CEST) 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 6705181385 for ; Mon, 22 Oct 2018 12:45:19 +0200 (CEST) From: Eric Botcazou To: gcc-patches@gcc.gnu.org Subject: [Ada] Robustify implementation of pragma Inspection_Point Date: Mon, 22 Oct 2018 12:45:16 +0200 Message-ID: <4045644.exW6arL5Zr@polaris> MIME-Version: 1.0 This avoids spurious errors on x86 when the register pressure is too high, for example on ACATS cxh3002: cxh3002.adb: In function 'CXH3002': cxh3002.adb:103:5: error: unsupported size for integer register Tested on x86_64-suse-linux, applied on mainline, 8 and 7 branches. 2018-10-22 Eric Botcazou * gcc-interface/trans.c (Pragma_to_gnu) : Use a simple memory constraint in all cases. Index: gcc-interface/trans.c =================================================================== --- gcc-interface/trans.c (revision 265367) +++ gcc-interface/trans.c (working copy) @@ -1285,32 +1285,18 @@ Pragma_to_gnu (Node_Id gnat_node) { Node_Id gnat_expr = Expression (gnat_temp); tree gnu_expr = gnat_to_gnu (gnat_expr); - int use_address; - machine_mode mode; - scalar_int_mode int_mode; tree asm_constraint = NULL_TREE; #ifdef ASM_COMMENT_START char *comment; #endif - - if (TREE_CODE (gnu_expr) == UNCONSTRAINED_ARRAY_REF) - gnu_expr = TREE_OPERAND (gnu_expr, 0); - - /* Use the value only if it fits into a normal register, - otherwise use the address. */ - mode = TYPE_MODE (TREE_TYPE (gnu_expr)); - use_address = (!is_a (mode, &int_mode) - || GET_MODE_SIZE (int_mode) > UNITS_PER_WORD); - - if (use_address) - gnu_expr = build_unary_op (ADDR_EXPR, NULL_TREE, gnu_expr); + gnu_expr = maybe_unconstrained_array (gnu_expr); + gnat_mark_addressable (gnu_expr); #ifdef ASM_COMMENT_START comment = concat (ASM_COMMENT_START, " inspection point: ", Get_Name_String (Chars (gnat_expr)), - use_address ? " address" : "", - " is in %0", + " is at %0", NULL); asm_constraint = build_string (strlen (comment), comment); free (comment); @@ -1320,8 +1306,8 @@ Pragma_to_gnu (Node_Id gnat_node) NULL_TREE, tree_cons (build_tree_list (NULL_TREE, - build_string (1, "g")), - gnu_expr, NULL_TREE), + build_string (1, "m")), + gnu_expr, NULL_TREE), NULL_TREE, NULL_TREE); ASM_VOLATILE_P (gnu_expr) = 1; set_expr_location_from_node (gnu_expr, gnat_node);