2011-08-05 Javier Miranda <miranda@adacore.com>

[pf3gnuchains/gcc-fork.git] / gcc / ada / sem_prag.adb

diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb
index de3e307..d699fd4 100644 (file)
--- a/gcc/ada/sem_prag.adb
+++ b/gcc/ada/sem_prag.adb
@@ -1794,7 +1794,7 @@ package body Sem_Prag is
               (Get_Pragma_Arg (Arg2), Standard_String);
          end if;
 
-         --  Record if pragma is enabled
+         --  Record if pragma is disabled
 
          if Check_Enabled (Pname) then
             Set_SCO_Pragma_Enabled (Loc);
@@ -5061,7 +5061,7 @@ package body Sem_Prag is
       begin
          --  Ignore all Restrictions pragma in CodePeer and ALFA modes
 
-         if CodePeer_Mode or else ALFA_Mode then
+         if CodePeer_Mode or ALFA_Mode then
             return;
          end if;
 
@@ -5287,7 +5287,7 @@ package body Sem_Prag is
          --  user code: we want to generate checks for analysis purposes, as
          --  set respectively by -gnatC and -gnatd.F
 
-         if (CodePeer_Mode or else ALFA_Mode)
+         if (CodePeer_Mode or ALFA_Mode)
            and then Comes_From_Source (N)
          then
             return;
@@ -7604,6 +7604,10 @@ package body Sem_Prag is
                 (Boolean_Literals (Debug_Pragmas_Enabled and Expander_Active),
                  Loc);
 
+            if Debug_Pragmas_Enabled then
+               Set_SCO_Pragma_Enabled (Loc);
+            end if;
+
             if Arg_Count = 2 then
                Cond :=
                  Make_And_Then (Loc,
@@ -9452,7 +9456,7 @@ package body Sem_Prag is
             --  in these modes.
 
             if not Restriction_Active (No_Initialize_Scalars)
-              and then not (CodePeer_Mode or else ALFA_Mode)
+              and then not (CodePeer_Mode or ALFA_Mode)
             then
                Init_Or_Norm_Scalars := True;
                Initialize_Scalars := True;
@@ -9482,7 +9486,7 @@ package body Sem_Prag is
             --  Pragma always active unless in CodePeer or ALFA mode, since
             --  this causes walk order issues.
 
-            if not (CodePeer_Mode or else ALFA_Mode) then
+            if not (CodePeer_Mode or ALFA_Mode) then
                Process_Inline (True);
             end if;
 
@@ -10925,7 +10929,7 @@ package body Sem_Prag is
             --  incorrect negative results in ALFA mode, so ignore this pragma
             --  in these modes.
 
-            if not (CodePeer_Mode or else ALFA_Mode) then
+            if not (CodePeer_Mode or ALFA_Mode) then
                Normalize_Scalars := True;
                Init_Or_Norm_Scalars := True;
             end if;
@@ -11294,7 +11298,7 @@ package body Sem_Prag is
                   --  complex front-end expansions related to pragma Pack,
                   --  so disable handling of pragma Pack in these cases.
 
-                  if CodePeer_Mode or else ALFA_Mode then
+                  if CodePeer_Mode or ALFA_Mode then
                      null;
 
                   --  Don't attempt any packing for VM targets. We possibly