diff --git a/gcc/ada/exp_ch6.adb b/gcc/ada/exp_ch6.adb
index 9a32f7ed702..00a0aef0631 100644
--- a/gcc/ada/exp_ch6.adb
+++ b/gcc/ada/exp_ch6.adb
@@ -3617,6 +3617,21 @@ package body Exp_Ch6 is
             then
                Prev_Orig := Prev;
 
+            --  If the actual is an attribute reference that was expanded
+            --  into a reference to an entity, then get accessibility level
+            --  from that entity. AARM 6.1.1(27.d) says "... the implicit
+            --  constant declaration defines the accessibility level of X'Old".
+
+            elsif Nkind (Prev_Orig) = N_Attribute_Reference
+              and then Nam_In (Attribute_Name (Prev_Orig),
+                               Name_Old,
+                               Name_Loop_Entry)
+              and then Is_Entity_Name (Prev)
+              and then Present (Entity (Prev))
+              and then Is_Object (Entity (Prev))
+            then
+               Prev_Orig := Prev;
+
             elsif Nkind (Prev_Orig) = N_Type_Conversion then
                Prev_Orig := Expression (Prev_Orig);
             end if;
diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb
index 756162e4a2f..40f34fd7b8a 100644
--- a/gcc/ada/sem_util.adb
+++ b/gcc/ada/sem_util.adb
@@ -24237,6 +24237,18 @@ package body Sem_Util is
       elsif Nkind (Orig_Obj) = N_Aggregate then
          return Object_Access_Level (Current_Scope);
 
+      --  Treat an Old/Loop_Entry attribute reference like an aggregate.
+      --  AARM 6.1.1(27.d) says "... the implicit constant declaration
+      --  defines the accessibility level of X'Old", so that is what
+      --  we are trying to implement here.
+
+      elsif Nkind (Orig_Obj) = N_Attribute_Reference
+        and then Nam_In (Attribute_Name (Orig_Obj),
+                         Name_Old,
+                         Name_Loop_Entry)
+      then
+         return Object_Access_Level (Current_Scope);
+
       --  Otherwise return the scope level of Standard. (If there are cases
       --  that fall through to this point they will be treated as having
       --  global accessibility for now. ???)