From patchwork Tue Nov 21 10:00:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Marc_Poulhi=C3=A8s?= X-Patchwork-Id: 80447 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8E3E1385DC1D for ; Tue, 21 Nov 2023 10:03:13 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by sourceware.org (Postfix) with ESMTPS id 62B3C38582A7 for ; Tue, 21 Nov 2023 10:00:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 62B3C38582A7 Authentication-Results: sourceware.org; dmarc=pass (p=none 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 62B3C38582A7 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::334 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700560849; cv=none; b=xRXqY4eIUjlFCY+r/EPofUhBl9XHgHTwmlWSi2siGDZ2dDSbFIHn7bOMDfY6i9lv12ZPw8IteyA6JTOhOzq7CcXZh3K1ZpT9OXi8mjSziJeoO/WN9NjeUgjLCJp5M9KQ0PmEXG+3CfRIT2t5GYnUhAIV5hla/5RGyeF5FfWGDRw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700560849; c=relaxed/simple; bh=LqcDzjzxtaoXZwr2I3N8ZgeAaSRc8wGzgBXIzD9QgPY=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=lrc6mWnmDl75IQw4Z0rjBUD3CQa8Uin5wZ8gZCStWXuhJzv8cELOZ1E87NAwIziJ9YOZULkLxNtSzCdMv1KHjMY53c7MVd8LZQeI6xdCxhvs9ZNlBu+u/Hkt30DB4KcvaQIqh6rdsDN8Oo4nSam6LpQOdp8WYHGdgpb3e1ZOGd0= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-40b2a8575d9so2172945e9.0 for ; Tue, 21 Nov 2023 02:00:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1700560846; x=1701165646; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=pkZjRh6qwwuw2c1oEsaRj12YbOjWNH0/QTTZuy+/VSY=; b=RYok6rjfG21+3cJ3ZILemywhU93f5H8XvGxOJf6ffY3dS/9OWbccNDpUKPOFhJjytR INm8PdtOfAl/mgo0WJ2SVe9pZa6m5f/1cty1VGG4o46zBxA8Yben2xPDWnX2Ml/oxtwS gJA0cPpqIEfSLImvdHCFD5ZwjVJ6yQDHn0SB4fyS4MMjoC9dQEAiG5LxJELMEhRD45yA aUNvmUvQpAMzh9VKNEQZXANFGsRBGHfwOfwLuas7opDYgPri2rwaCu+BikWableLJxr2 KZbAq1dcFLZNdv8gkiirnhISL0KXLULLX14rHsG8s2+YeQeqnGbYekRxV98jTiqkRnXS KoOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700560846; x=1701165646; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=pkZjRh6qwwuw2c1oEsaRj12YbOjWNH0/QTTZuy+/VSY=; b=UJ3+pxFTlabnbOLAAXv+312VLnobC0pEeikbDGWd8d1CuHz8WychYo+8/3UBgLIMmc 7v/TLZyoBvfHPwXIxhfi0jOmvf+/3VdfyO4Ffxtc66yagGhiUbJpDVy0F1o4LRuwgl6d u4ITLDpH/7EskathBWvxVTowYwcStbLYzqxEno95avGWgIk9SYom/vbD+givBSM1vPM2 RbwA2ZQYv5br4UedYF2GdBOGwcFICZz/njwWvCkPp2CkTaPTYpjlyj05WzjJyZZSLAe8 7kw1NgKgtTTlKSj7rCHQeByEiE1h5TPcVlHvGbakU0MaGSszqACcfFcyJDK+g0RdCIv2 ym9A== X-Gm-Message-State: AOJu0Yxel1ItHm3Be150r4GcsF8MKCQctcF7O7/e0DW9+qrOoE9P2HZy J5X7z3vw+UNaeXYPLC40ozddMv66D73G5+K4U2g0kw== X-Google-Smtp-Source: AGHT+IFBenjhdgcuj5Oi6LtEOcNYPuMoUme105+07bAWllJfWX5eS6J96BHlcHMVcXdNenQhJ0DD7g== X-Received: by 2002:a05:600c:4f07:b0:40b:2a69:6c19 with SMTP id l7-20020a05600c4f0700b0040b2a696c19mr638132wmq.6.1700560846178; Tue, 21 Nov 2023 02:00:46 -0800 (PST) Received: from poulhies-Precision-5550.telnowedge.local (lmontsouris-659-1-24-67.w81-250.abo.wanadoo.fr. [81.250.175.67]) by smtp.gmail.com with ESMTPSA id n21-20020a7bc5d5000000b003fbe4cecc3bsm20350159wmk.16.2023.11.21.02.00.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 02:00:45 -0800 (PST) From: =?utf-8?q?Marc_Poulhi=C3=A8s?= To: gcc-patches@gcc.gnu.org Cc: Viljar Indus Subject: [COMMITTED] ada: Avoid Style_Checks pragmas affecting other units Date: Tue, 21 Nov 2023 11:00:44 +0100 Message-ID: <20231121100044.1964839-1-poulhies@adacore.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 X-Spam-Status: No, score=-13.7 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, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org From: Viljar Indus gcc/ada/ * par.adb: Restore Style_Checks after parsing each unit. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/par.adb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gcc/ada/par.adb b/gcc/ada/par.adb index 180ec08561c..4e10dd9049c 100644 --- a/gcc/ada/par.adb +++ b/gcc/ada/par.adb @@ -80,6 +80,10 @@ function Par (Configuration_Pragmas : Boolean) return List_Id is -- True within a delta aggregate (but only after the "delta" token has -- been scanned). Used to distinguish syntax errors from syntactically -- correct "deep" delta aggregates (enabled via -gnatX0). + Save_Style_Checks : Style_Check_Options; + Save_Style_Check : Boolean; + -- Variables for storing the original state of whether style checks should + -- be active in general and which particular ones should be checked. -------------------- -- Error Recovery -- @@ -1601,6 +1605,11 @@ begin else Save_Config_Attrs := Save_Config_Switches; + -- Store the state of Style_Checks pragamas + + Save_Style_Check := Style_Check; + Save_Style_Check_Options (Save_Style_Checks); + -- The following loop runs more than once in syntax check mode -- where we allow multiple compilation units in the same file -- and in Multiple_Unit_Per_file mode where we skip units till @@ -1658,6 +1667,7 @@ begin -- syntax mode we are interested in all units in the file. else + declare Comp_Unit_Node : constant Node_Id := P_Compilation_Unit; @@ -1744,6 +1754,13 @@ begin Restore_Config_Switches (Save_Config_Attrs); end loop; + -- Restore the state of Style_Checks after parsing the unit to + -- avoid parsed pragmas affecting other units. + + Reset_Style_Check_Options; + Set_Style_Check_Options (Save_Style_Checks); + Style_Check := Save_Style_Check; + -- Now that we have completely parsed the source file, we can complete -- the source file table entry.