diff options
author | Eric Botcazou <ebotcazou@adacore.com> | 2016-06-29 13:03:22 +0000 |
---|---|---|
committer | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2016-06-29 13:03:22 +0000 |
commit | 9182f7184019a076898de5f2429ea5822e5ff324 (patch) | |
tree | 3e323522044ad364a4f5045ce965e3e6397562fb /gcc/ada/gcc-interface/utils2.c | |
parent | 1af21224e417d96b363e2b7dec0cbb0e3ed78f99 (diff) | |
download | gcc-9182f7184019a076898de5f2429ea5822e5ff324.zip gcc-9182f7184019a076898de5f2429ea5822e5ff324.tar.gz gcc-9182f7184019a076898de5f2429ea5822e5ff324.tar.bz2 |
re PR ada/48835 (porting GNAT to m68k-linux)
PR ada/48835
PR ada/61954
* gcc-interface/gigi.h (enum standard_datatypes): Add ADT_realloc_decl
(realloc_decl): New macro.
* gcc-interface/decl.c (gnat_to_gnu_entity) <E_Variable>: Use local
variable for the entity type and translate it as void pointer if the
entity has convention C.
(gnat_to_gnu_entity) <E_Function>: If this is not a definition and the
external name matches that of malloc_decl or realloc_decl, return the
correspoding node directly.
(gnat_to_gnu_subprog_type): Likewise for parameter and return types.
* gcc-interface/trans.c (gigi): Initialize void_list_node here, not...
Initialize realloc_decl.
* gcc-interface/utils.c (install_builtin_elementary_types): ...here.
(build_void_list_node): Delete.
* gcc-interface/utils2.c (known_alignment) <CALL_EXPR>: Return the
alignment of the system allocator for malloc_decl and realloc_decl.
Do not take alignment from void pointer types either.
From-SVN: r237850
Diffstat (limited to 'gcc/ada/gcc-interface/utils2.c')
-rw-r--r-- | gcc/ada/gcc-interface/utils2.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gcc/ada/gcc-interface/utils2.c b/gcc/ada/gcc-interface/utils2.c index aeb6cc3..638d59b 100644 --- a/gcc/ada/gcc-interface/utils2.c +++ b/gcc/ada/gcc-interface/utils2.c @@ -171,8 +171,8 @@ known_alignment (tree exp) case CALL_EXPR: { - tree func = get_callee_fndecl (exp); - if (func && DECL_IS_MALLOC (func)) + tree fndecl = get_callee_fndecl (exp); + if (fndecl == malloc_decl || fndecl == realloc_decl) return get_target_system_allocator_alignment () * BITS_PER_UNIT; tree t = maybe_inline_call_in_expr (exp); @@ -188,7 +188,8 @@ known_alignment (tree exp) have a dummy type here (e.g. a Taft Amendment type), for which the alignment is meaningless and should be ignored. */ if (POINTER_TYPE_P (TREE_TYPE (exp)) - && !TYPE_IS_DUMMY_P (TREE_TYPE (TREE_TYPE (exp)))) + && !TYPE_IS_DUMMY_P (TREE_TYPE (TREE_TYPE (exp))) + && !VOID_TYPE_P (TREE_TYPE (TREE_TYPE (exp)))) this_alignment = TYPE_ALIGN (TREE_TYPE (TREE_TYPE (exp))); else this_alignment = 0; |