From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by sourceware.org (Postfix) with ESMTPS id 1C7F5385840C for ; Tue, 21 May 2024 07:30:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1C7F5385840C Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 1C7F5385840C Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::330 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1716276659; cv=none; b=p9khytaGQOasQqK/7eMmbJ59t9UnKUe5JEF2X5aT7p1ZmPqFwMa4LxKQjxQ97GQ7fdFfUR2Rynv7ntQQdTEyx/x1GrFf7DkUY7TZnuUUHBOMXTiqbqD9k37imiBpoNHAs7Bws1eaRaq5fG2uTLPU5XXzy7Y3a2F4KwAHxHJMRG8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1716276659; c=relaxed/simple; bh=wH3WYbhq3R4cc/Ktn30nZVHYEeQXKhDMyrKLq72Xhbo=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=LKKByw8+AidXVbwgDMSt5qJvbAnDyh99LKpFn8hC/Wxv03MtHEO6saDW/rzp3SzoIet7dIKd+phZHGBmn/DXY7bqobquGwyRf/PMw0IVRLHNiiUcNWdcZjcUfik7E8YC09Ap+4TYn+XAJMuhJ8gWqGACymFPk70alA6nxtZUQ2Q= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-41fc5645bb1so25612595e9.1 for ; Tue, 21 May 2024 00:30:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1716276657; x=1716881457; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vuf4WGfyuOLi1r2aI5FRczlqMI7ScbbeRzx0Bbv4Ah4=; b=i3WXqYL7jqWkzA6IMckipnuwCeMXM7GnBAwAXRhKOZTOkHCZwea0Bm0/n1T/K11G9G IxM0ktIDPT8lARLUeOTV9uS0TGbME20gTG94cFZZxoOK2ug4/9zXQolzcmz5F3+WgkLw AmdVc2OlzIWerUdsjuoH7RHy9T+BoKGqMeqi2lx9Uu++SsZvN0/JVuKOE+zrQ9gAqDgZ aHHhGzbfQSfL9747+gpQFVpGzTiznDTYnlZo/Bj0t7Pfl1ot70P2I64y03KP5nJzKtqS ZUSsoA9wqIpKuCglWCZTr4ywOehg4o6v8L6Cxc/n6QovzFrLvBdh1i/Wx/tclgzw9Cym 2iBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716276657; x=1716881457; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vuf4WGfyuOLi1r2aI5FRczlqMI7ScbbeRzx0Bbv4Ah4=; b=Vt8cFU/UajgU1BaKmNZP2MwmqV9JUnAfP/DdOKMQbGs6/gAZjaQghsS1A41033SlQa mq8YCoB4nCPq0n/HWTvDV503OjqA2LXSjyntVI0I9yphrcH9rTSkcZsjhCGl9F0Y1CrM mQS8YdpS5gMnlj4DrGuSbqt77YttUsmlfrjt8CsTKXC5HrFKMEYHgFTiRlJMp3iyzFUY dGvMQ3+w0vZr2VGr5R/mCmFGV2f7ztcjgTtvVrIz/1JWbuhe8JtZR2aJJLIcyHDKO4oK 7Df5HPxYM0i4vYQ1Ra1q+AGyP5EJBPcJph55/RQbhC4v1BS2AYnuMTFeVkjBpO3mCoa3 OOGw== X-Gm-Message-State: AOJu0YzXm+5psf3xc8itQa9h5jXpARTtJxuQcK7V0YyZEX4I/238/lca rcoqzZmHY9RSgFmUWZMtyk0IPr8X29OQHczOeDmGHistFpO2a1r/e94xZLH54/tc1fUDgUYhKWc = X-Google-Smtp-Source: AGHT+IFAsMWRqN+DS+riR6VsDFPS00S9YQt+shokDETLziOKOendNx1cp0Ao6BlWG4fNKaegOi/VOA== X-Received: by 2002:a05:600c:1d13:b0:41e:1bc1:36de with SMTP id 5b1f17b1804b1-41feac59cb4mr249542685e9.26.1716276656840; Tue, 21 May 2024 00:30:56 -0700 (PDT) Received: from localhost.localdomain ([2001:861:3382:1a90:de37:8b1c:1f33:2610]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-41fccee9292sm453333645e9.37.2024.05.21.00.30.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 May 2024 00:30:56 -0700 (PDT) From: =?UTF-8?q?Marc=20Poulhi=C3=A8s?= To: gcc-patches@gcc.gnu.org Cc: Piotr Trojanek Subject: [COMMITTED 11/31] ada: Simplify management of scopes while inlining Date: Tue, 21 May 2024 09:30:14 +0200 Message-ID: <20240521073035.314024-11-poulhies@adacore.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240521073035.314024-1-poulhies@adacore.com> References: <20240521073035.314024-1-poulhies@adacore.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-13.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: From: Piotr Trojanek Code cleanup; semantics is unaffected. gcc/ada/ * inline.adb (Add_Scope_To_Clean): Use Append_Unique_Elmt. (Analyze_Inlined_Bodies): Refine type of a local counter; remove extra whitespace. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/inline.adb | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/gcc/ada/inline.adb b/gcc/ada/inline.adb index a628a59e145..17b3099e6a6 100644 --- a/gcc/ada/inline.adb +++ b/gcc/ada/inline.adb @@ -845,19 +845,8 @@ package body Inline is ------------------------ procedure Add_Scope_To_Clean (Scop : Entity_Id) is - Elmt : Elmt_Id; - begin - Elmt := First_Elmt (To_Clean); - while Present (Elmt) loop - if Node (Elmt) = Scop then - return; - end if; - - Next_Elmt (Elmt); - end loop; - - Append_Elmt (Scop, To_Clean); + Append_Unique_Elmt (Scop, To_Clean); end Add_Scope_To_Clean; -------------- @@ -915,7 +904,7 @@ package body Inline is procedure Analyze_Inlined_Bodies is Comp_Unit : Node_Id; - J : Int; + J : Nat; Pack : Entity_Id; Subp : Subp_Index; S : Succ_Index; @@ -2569,8 +2558,8 @@ package body Inline is (Proc_Id : out Entity_Id; Decl_List : out List_Id) is - Formals : constant List_Id := New_List; - Subp_Name : constant Name_Id := New_Internal_Name ('F'); + Formals : constant List_Id := New_List; + Subp_Name : constant Name_Id := New_Internal_Name ('F'); Body_Decls : List_Id := No_List; Decl : Node_Id; -- 2.43.2