aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Dismukes <dismukes@adacore.com>2024-04-17 23:44:41 +0000
committerMarc Poulhiès <poulhies@adacore.com>2024-06-10 11:04:01 +0200
commitf5e372e2a31c19ed0c784cfb3ebd373802a106ff (patch)
tree163e3f61182c404dfcf40d55b99d6bee337263c3
parent9bf9e60e262f54d87b146a2a322a8ad6324301ea (diff)
downloadgcc-f5e372e2a31c19ed0c784cfb3ebd373802a106ff.zip
gcc-f5e372e2a31c19ed0c784cfb3ebd373802a106ff.tar.gz
gcc-f5e372e2a31c19ed0c784cfb3ebd373802a106ff.tar.bz2
ada: Derived type with convention C must override convention C_Pass_By_Copy
If a type DT is derived from a record type T with convention C_Pass_By_Copy and explicitly specifies convention C (via aspect or pragma), then type DT should not be treated as a type with convention C_Pass_By_Copy. Any parameters of the derived type should be passed by reference rather than by copy. The compiler was incorrectly inheriting convention C_Pass_By_Copy, by inheriting the flag set on the parent type, but that flag needs to be unset in the case where the convention is overridden. gcc/ada/ * sem_prag.adb (Set_Convention_From_Pragma): If the specified convention on a record type is not C_Pass_By_Copy, then force the C_Pass_By_Copy flag to False, to ensure that it's overridden.
-rw-r--r--gcc/ada/sem_prag.adb9
1 files changed, 9 insertions, 0 deletions
diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb
index 9ccf1b9..671b2a5 100644
--- a/gcc/ada/sem_prag.adb
+++ b/gcc/ada/sem_prag.adb
@@ -8498,6 +8498,15 @@ package body Sem_Prag is
end if;
end if;
+ -- If the convention of a record type is changed (such as to C),
+ -- this must override C_Pass_By_Copy if that flag was inherited
+ -- from a parent type where the latter convention was specified,
+ -- so we force the flag to False.
+
+ if Cname /= Name_C_Pass_By_Copy and then Is_Record_Type (E) then
+ Set_C_Pass_By_Copy (Base_Type (E), False);
+ end if;
+
-- If the entity is a derived boolean type, check for the special
-- case of convention C, C++, or Fortran, where we consider any
-- nonzero value to represent true.