From patchwork Fri Jan 24 11:42:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Charlet X-Patchwork-Id: 313892 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 BD7292C009C for ; Fri, 24 Jan 2014 22:42:40 +1100 (EST) 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=oIwdyvyT/pYNq9+WG567Brfs1V1nTYuxooxCyqrqwJ2xJQxFoi 4PYEe8Wrn41+TrOoVFqCT2DQYTCIy346YePvsgVhgxzUhlbTpLbz6kg3fOlKkoPb dyoKNI1YrnDKjb7nb8C5/2ePaScm7UZxl7wvJV86+I9R7UYCiRTdhuZVM= 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=S1EjSSeAWFhGcbZdgWa3+v7CDwE=; b=SvPHE5bygqT7BtvoYR7T 9HxgcRLaf9oM1oQvkOHmcp5GpolGBBjcI8PjmuwndgdLg1AbujTRMkQ+4J4d6YMS knI4NVZlXRHtfQXlHMPu/PS5hPQG7M4P4hmSs1m5sU2RxPKcierUAv6YdIyF/jFp MYf7H99bpr5JAD7zu/wZkDQ= Received: (qmail 21760 invoked by alias); 24 Jan 2014 11:42: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 21751 invoked by uid 89); 24 Jan 2014 11:42:32 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.3.2 X-HELO: rock.gnat.com Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Fri, 24 Jan 2014 11:42:30 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 59A6F1165CE; Fri, 24 Jan 2014 06:42:28 -0500 (EST) 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 YaLPe-1fpzot; Fri, 24 Jan 2014 06:42:28 -0500 (EST) Received: from kwai.gnat.com (unknown [IPv6:2620:20:4000:0:a6ba:dbff:fe26:1f63]) by rock.gnat.com (Postfix) with ESMTP id 478871165C4; Fri, 24 Jan 2014 06:42:28 -0500 (EST) Received: by kwai.gnat.com (Postfix, from userid 4192) id 4524C3FB31; Fri, 24 Jan 2014 06:42:28 -0500 (EST) Date: Fri, 24 Jan 2014 06:42:28 -0500 From: Arnaud Charlet To: gcc-patches@gcc.gnu.org Cc: Robert Dewar Subject: [Ada] Fix crash for bad Depends operand Message-ID: <20140124114228.GA27319@adacore.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) This fixes a failure to properly diagnose a bad Depends operand. The following program used to provoke this crash: 1. procedure DependsCrash is 2. type R is record 3. B : Boolean; 4. end record; 5. 6. procedure Test (X : R; B : out Boolean) | >>> item "X" must appear in at least one input list of aspect Depends 7. with Depends => (B => X.B); | >>> item must denote variable, state or formal parameter 8. 9. procedure Test (X : R; B : out Boolean) 10. is begin null; end; 11. 12. begin 13. null; 14. end DependsCrash; Tested on x86_64-pc-linux-gnu, committed on trunk 2014-01-24 Robert Dewar * sem_prag.adb (Analyze_Input_Output): Add missing error check for junk operand. * sem_util.adb (Is_Refined_State): Add defense against junk tree from error. Index: sem_prag.adb =================================================================== --- sem_prag.adb (revision 207026) +++ sem_prag.adb (working copy) @@ -783,9 +783,9 @@ Item_Id := Entity_Of (Item); - Record_Possible_Body_Reference (Item, Item_Id); + if Present (Item_Id) then + Record_Possible_Body_Reference (Item, Item_Id); - if Present (Item_Id) then if Ekind_In (Item_Id, E_Abstract_State, E_In_Parameter, E_In_Out_Parameter, Index: sem_util.adb =================================================================== --- sem_util.adb (revision 207026) +++ sem_util.adb (working copy) @@ -3723,6 +3723,12 @@ else Item_Id := Entity_Of (Item); + -- Defend against junk + + if No (Item_Id) then + return False; + end if; + return Ekind (Item_Id) = E_Abstract_State and then Has_Visible_Refinement (Item_Id);