diff mbox series

[COMMITTED] ada: Avoid Style_Checks pragmas affecting other units

Message ID 20231121100044.1964839-1-poulhies@adacore.com
State Committed
Commit 3827a017667532656285c9cf7f6448ff688221a9
Headers
Series [COMMITTED] ada: Avoid Style_Checks pragmas affecting other units |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_gcc_build--master-arm warning Patch is already merged
linaro-tcwg-bot/tcwg_gcc_build--master-aarch64 warning Patch is already merged

Commit Message

Marc Poulhiès Nov. 21, 2023, 10 a.m. UTC 
  From: Viljar Indus <indus@adacore.com>

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 mbox series

Patch

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.