From 063907abadf6ee9ffe4d60d4b61eb8a144aa29f7 Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Tue, 13 Aug 2019 08:08:06 +0000 Subject: [PATCH] [Ada] Fix bogus style check failure with pragma Style_Checks (Off) This fixes a bogus style check failure for long lines in rare cases where the compiler is invoked, with a -gnatyX switch where X is neither 'm' nor 'M', on a unit which contains "with" clauses for other units that contain a pragma Style_Checks (Off). 2019-08-13 Eric Botcazou gcc/ada/ * sem.adb (Do_Analyze): Recompute Style_Check_Max_Line_Length after restoring Style_Max_Line_Length. From-SVN: r274352 --- gcc/ada/ChangeLog | 5 +++++ gcc/ada/sem.adb | 1 + 2 files changed, 6 insertions(+) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 162d027ce73..a34c4eec137 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2019-08-13 Eric Botcazou + + * sem.adb (Do_Analyze): Recompute Style_Check_Max_Line_Length + after restoring Style_Max_Line_Length. + 2019-08-13 Arnaud Charlet * sem_ch13.adb (Check_Iterator_Functions): Protect against diff --git a/gcc/ada/sem.adb b/gcc/ada/sem.adb index 2f8f6a4eee4..9b6b33535f9 100644 --- a/gcc/ada/sem.adb +++ b/gcc/ada/sem.adb @@ -1395,6 +1395,7 @@ package body Sem is Restore_Scope_Stack (List); Restore_Ghost_Region (Saved_GM, Saved_IGR); Style_Max_Line_Length := Saved_ML; + Style_Check_Max_Line_Length := Style_Max_Line_Length /= 0; end Do_Analyze; -- Local variables -- 2.30.2