diff options
author | Iain Buclaw <ibuclaw@gdcproject.org> | 2020-09-12 16:48:58 +0200 |
---|---|---|
committer | Iain Buclaw <ibuclaw@gdcproject.org> | 2020-09-12 21:34:38 +0200 |
commit | 707e9159ed25d19c174e4da18b194e530878d450 (patch) | |
tree | c28d409b32c482ff55965576c1198b0a1568d3d2 /gcc/d | |
parent | e4011c13c1f8d51f00af61bcb8189bcbe45823b7 (diff) | |
download | gcc-707e9159ed25d19c174e4da18b194e530878d450.zip gcc-707e9159ed25d19c174e4da18b194e530878d450.tar.gz gcc-707e9159ed25d19c174e4da18b194e530878d450.tar.bz2 |
d: Return promoted types in d_type_promotes_to when linkage is not D
This enables warnings to be shown when a bad type is passed to va_arg
inside an extern(C) or extern(C++) function.
gcc/d/ChangeLog:
PR d/97002
* d-codegen.cc (d_build_call): Set input_location on CALL_EXPR.
* d-lang.cc: Include function.h.
(d_type_promotes_to): Do default conversions for C and C++ functions.
* intrinsics.cc (expand_intrinsic_vaarg): Use build1_loc to build
VA_ARG_EXPR.
gcc/testsuite/ChangeLog:
PR d/97002
* gdc.dg/pr97002.d: New test.
Diffstat (limited to 'gcc/d')
-rw-r--r-- | gcc/d/d-codegen.cc | 1 | ||||
-rw-r--r-- | gcc/d/d-lang.cc | 58 | ||||
-rw-r--r-- | gcc/d/intrinsics.cc | 2 |
3 files changed, 58 insertions, 3 deletions
diff --git a/gcc/d/d-codegen.cc b/gcc/d/d-codegen.cc index 4050b85..1f2d65c 100644 --- a/gcc/d/d-codegen.cc +++ b/gcc/d/d-codegen.cc @@ -2042,6 +2042,7 @@ d_build_call (TypeFunction *tf, tree callable, tree object, } tree result = build_call_vec (TREE_TYPE (ctype), callee, args); + SET_EXPR_LOCATION (result, input_location); /* Enforce left to right evaluation. */ if (tf->linkage == LINKd) diff --git a/gcc/d/d-lang.cc b/gcc/d/d-lang.cc index c5254a0..fb95716 100644 --- a/gcc/d/d-lang.cc +++ b/gcc/d/d-lang.cc @@ -43,6 +43,7 @@ along with GCC; see the file COPYING3. If not see #include "langhooks.h" #include "langhooks-def.h" #include "target.h" +#include "function.h" #include "stringpool.h" #include "stor-layout.h" #include "varasm.h" @@ -1358,12 +1359,65 @@ d_type_for_size (unsigned bits, int unsignedp) return 0; } -/* Implements the lang_hooks.types.type_promotes_to routine for language D. - All promotions for variable arguments are handled by the D frontend. */ +/* Implements the lang_hooks.types.type_promotes_to routine for language D. */ static tree d_type_promotes_to (tree type) { + /* Promotions are only applied on unnamed function arguments for declarations + with `extern(C)' or `extern(C++)' linkage. */ + if (cfun && DECL_LANG_FRONTEND (cfun->decl) + && DECL_LANG_FRONTEND (cfun->decl)->linkage != LINKd) + { + /* In [type/integer-promotions], integer promotions are conversions of the + following types: + + bool int + byte int + ubyte int + short int + ushort int + char int + wchar int + dchar uint + + If an enum has as a base type one of the types in the left column, it + is converted to the type in the right column. */ + if (TREE_CODE (type) == ENUMERAL_TYPE && ENUM_IS_SCOPED (type)) + type = TREE_TYPE (type); + + type = TYPE_MAIN_VARIANT (type); + + /* Check for promotions of target-defined types first. */ + tree promoted_type = targetm.promoted_type (type); + if (promoted_type) + return promoted_type; + + if (TREE_CODE (type) == BOOLEAN_TYPE) + return d_int_type; + + if (INTEGRAL_TYPE_P (type)) + { + if (type == d_byte_type || type == d_ubyte_type + || type == d_short_type || type == d_ushort_type + || type == char8_type_node || type == char16_type_node) + return d_int_type; + + if (type == char32_type_node) + return d_uint_type; + + if (TYPE_PRECISION (type) < TYPE_PRECISION (d_int_type)) + return d_int_type; + } + + /* Float arguments are converted to doubles. */ + if (type == float_type_node) + return double_type_node; + + if (type == ifloat_type_node) + return idouble_type_node; + } + return type; } diff --git a/gcc/d/intrinsics.cc b/gcc/d/intrinsics.cc index 1b12a3e..a629472 100644 --- a/gcc/d/intrinsics.cc +++ b/gcc/d/intrinsics.cc @@ -562,7 +562,7 @@ expand_intrinsic_vaarg (tree callexp) } /* (T) VA_ARG_EXP<ap>; */ - tree exp = build1 (VA_ARG_EXPR, type, ap); + tree exp = build1_loc (EXPR_LOCATION (callexp), VA_ARG_EXPR, type, ap); /* parmn = (T) VA_ARG_EXP<ap>; */ if (parmn != NULL_TREE) |