diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb
--- a/gcc/ada/sem_ch13.adb
+++ b/gcc/ada/sem_ch13.adb
@@ -8561,7 +8561,7 @@ package body Sem_Ch13 is
 
                      Generate_Reference
                        (Comp, Component_Name (CC), Set_Ref => False);
-                     Set_Entity (Component_Name (CC), Comp);
+                     Set_Entity_With_Checks (Component_Name (CC), Comp);
 
                      --  Update Fbit and Lbit to the actual bit number
 


diff --git a/gcc/ada/style.adb b/gcc/ada/style.adb
--- a/gcc/ada/style.adb
+++ b/gcc/ada/style.adb
@@ -136,48 +136,42 @@ package body Style is
             Tref := Source_Text (Get_Source_File_Index (Sref));
             Tdef := Source_Text (Get_Source_File_Index (Sdef));
 
-            --  Ignore operator name case completely. This also catches the
-            --  case of where one is an operator and the other is not. This
-            --  is a phenomenon from rewriting of operators as functions,
-            --  and is to be ignored.
+            --  Ignore case of operator names. This also catches the case
+            --  where one is an operator and the other is not. This is a
+            --  phenomenon from rewriting of operators as functions, and is
+            --  to be ignored.
 
             if Tref (Sref) = '"' or else Tdef (Sdef) = '"' then
                return;
 
             else
-               while Tref (Sref) = Tdef (Sdef) loop
+               loop
+                  --  If end of identifiers, all done. Note that they are the
+                  --  same length.
 
-                  --  If end of identifier, all done
+                  pragma Assert
+                    (Identifier_Char (Tref (Sref)) =
+                     Identifier_Char (Tdef (Sdef)));
 
                   if not Identifier_Char (Tref (Sref)) then
                      return;
-
-                  --  Otherwise loop continues
-
-                  else
-                     Sref := Sref + 1;
-                     Sdef := Sdef + 1;
                   end if;
-               end loop;
 
-               --  Fall through loop when mismatch between identifiers
-               --  If either identifier is not terminated, error.
+                  --  Case mismatch
 
-               if Identifier_Char (Tref (Sref))
-                    or else
-                  Identifier_Char (Tdef (Sdef))
-               then
-                  Error_Msg_Node_1 := Def;
-                  Error_Msg_Sloc := Sloc (Def);
-                  Error_Msg -- CODEFIX
-                    ("(style) bad casing of & declared#", Sref, Ref);
-                  return;
+                  if Tref (Sref) /= Tdef (Sdef) then
+                     Error_Msg_Node_1 := Def;
+                     Error_Msg_Sloc := Sloc (Def);
+                     Error_Msg -- CODEFIX
+                       ("(style) bad casing of & declared#", Sref, Ref);
+                     return;
+                  end if;
 
-               --  Else end of identifiers, and they match
+                  Sref := Sref + 1;
+                  Sdef := Sdef + 1;
+               end loop;
 
-               else
-                  return;
-               end if;
+               pragma Assert (False);
             end if;
          end if;