From patchwork Thu May 31 10:48:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Marie de Rodat X-Patchwork-Id: 923310 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-478821-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="LmDXG/LA"; 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 40xPPt3BVqz9s0W for ; Thu, 31 May 2018 20:50:42 +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=cvQAwiZAKLtVmG3gjaDkJav+H+4ce6LuEofnIuIh+3FyGgRCnu XM2JBDRvfuUwKesbKaqVU2KNMqRUvq2/+pbLxSrVsdXB07vkOWAptAO2YgaRVR9V epEdk5s5F25FhQSJ5i21yujpGYua5rK8uBhZyy38pEOCbmKb93gMN0QUA= 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=shLTufFY5usNTRwwrB9JrBGQwoo=; b=LmDXG/LAKbB4X4TqkAg9 QK+lqoh9pi2QIkGQFWSxKyQLOWNpZ28xe3dt5ipIkaBYqeter7LjpkhLfGQnkIwt UJrj0hAI9+I4iWkY4yewo6iI2TASyjKSmnmf6Asu4NnrW7qkRVzJSF+37PGkYV9+ gdMXrxt+ep+tNUEa2OeepGQ= Received: (qmail 109138 invoked by alias); 31 May 2018 10:49:02 -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 108994 invoked by uid 89); 31 May 2018 10:49:00 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-11.1 required=5.0 tests=BAYES_00, GIT_PATCH_2, GIT_PATCH_3, SPF_NEUTRAL autolearn=ham version=3.3.2 spammy=gnat.dg, UD:gnat.dg, gnatdg, Hristian X-HELO: eggs.gnu.org Received: from eggs.gnu.org (HELO eggs.gnu.org) (208.118.235.92) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 31 May 2018 10:48:59 +0000 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fOL8Z-0004o0-PJ for gcc-patches@gcc.gnu.org; Thu, 31 May 2018 06:48:56 -0400 Received: from rock.gnat.com ([2620:20:4000:0:a9e:1ff:fe9b:1d1]:53454) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fOL8Z-0004kZ-KQ for gcc-patches@gcc.gnu.org; Thu, 31 May 2018 06:48:55 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id BA0E3560D6; Thu, 31 May 2018 06:48:51 -0400 (EDT) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id zQIk9mDtKtH0; Thu, 31 May 2018 06:48:51 -0400 (EDT) Received: from tron.gnat.com (tron.gnat.com [IPv6:2620:20:4000:0:46a8:42ff:fe0e:e294]) by rock.gnat.com (Postfix) with ESMTP id A934F117F92; Thu, 31 May 2018 06:48:51 -0400 (EDT) Received: by tron.gnat.com (Postfix, from userid 4862) id A831E4C2; Thu, 31 May 2018 06:48:51 -0400 (EDT) Date: Thu, 31 May 2018 06:48:51 -0400 From: Pierre-Marie de Rodat To: gcc-patches@gcc.gnu.org Cc: Hristian Kirtchev Subject: [Ada] Spurious tampering check failure Message-ID: <20180531104851.GA119772@adacore.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 2620:20:4000:0:a9e:1ff:fe9b:1d1 X-IsSubscribed: yes This patch modifies the transient scope mechanism to create a scope when the condition of an iteration scheme returns a controlled result or involves the secondary stack. As a result, a while loop which iterates over a container properly manages the tampering bit at each iteration of the loop. Tested on x86_64-pc-linux-gnu, committed on trunk 2018-05-31 Hristian Kirtchev gcc/ada/ * exp_ch7.adb (Find_Transient_Context): An iteration scheme is a valid boudary for a transient scope. gcc/testsuite/ * gnat.dg/tampering_check1.adb, gnat.dg/tampering_check1_ivectors.ads, gnat.dg/tampering_check1_trim.adb, gnat.dg/tampering_check1_trim.ads: New testcase. --- gcc/ada/exp_ch7.adb +++ gcc/ada/exp_ch7.adb @@ -4987,6 +4987,7 @@ package body Exp_Ch7 is | N_Entry_Body_Formal_Part | N_Exit_Statement | N_If_Statement + | N_Iteration_Scheme | N_Terminate_Alternative => pragma Assert (Present (Prev)); @@ -5058,13 +5059,11 @@ package body Exp_Ch7 is return Curr; end if; - -- An iteration scheme or an Ada 2012 iterator specification is - -- not a valid context because Analyze_Iteration_Scheme already - -- employs special processing for them. + -- An Ada 2012 iterator specification is not a valid context + -- because Analyze_Iterator_Specification already employs special + -- processing for it. - when N_Iteration_Scheme - | N_Iterator_Specification - => + when N_Iterator_Specification => return Empty; when N_Loop_Parameter_Specification => --- /dev/null new file mode 100644 +++ gcc/testsuite/gnat.dg/tampering_check1.adb @@ -0,0 +1,15 @@ +-- { dg-do run } + +with Tampering_Check1_IVectors; use Tampering_Check1_IVectors; +with Tampering_Check1_Trim; + +procedure Tampering_Check1 is + V : Vector; + +begin + V.Append (-1); + V.Append (-2); + V.Append (-3); + + Tampering_Check1_Trim (V); +end Tampering_Check1; --- /dev/null new file mode 100644 +++ gcc/testsuite/gnat.dg/tampering_check1_ivectors.ads @@ -0,0 +1,4 @@ +with Ada.Containers.Vectors; + +package Tampering_Check1_IVectors is new + Ada.Containers.Vectors (Positive, Integer); --- /dev/null new file mode 100644 +++ gcc/testsuite/gnat.dg/tampering_check1_trim.adb @@ -0,0 +1,9 @@ +procedure Tampering_Check1_Trim + (V : in out Tampering_Check1_IVectors.Vector) is + use Tampering_Check1_IVectors; + +begin + while not Is_Empty (V) and then V (V.First) < 0 loop + V.Delete_First; + end loop; +end Tampering_Check1_Trim; --- /dev/null new file mode 100644 +++ gcc/testsuite/gnat.dg/tampering_check1_trim.ads @@ -0,0 +1,4 @@ +with Tampering_Check1_IVectors; + +procedure Tampering_Check1_Trim + (V : in out Tampering_Check1_IVectors.Vector);