diff options
| author | Iain Buclaw <ibuclaw@gdcproject.org> | 2020-06-05 17:50:49 +0200 |
|---|---|---|
| committer | Iain Buclaw <ibuclaw@gdcproject.org> | 2020-06-05 17:52:57 +0200 |
| commit | 5905cbdbcf6d760303ca87f27e04824f26976de4 (patch) | |
| tree | 16ea452b43613d027a78c18b033f7659f0cdbbbf /gcc/d/decl.cc | |
| parent | 300452d7bf1d3a0ff3f7585a1166f3d473c70556 (diff) | |
| download | gcc-5905cbdbcf6d760303ca87f27e04824f26976de4.zip gcc-5905cbdbcf6d760303ca87f27e04824f26976de4.tar.gz gcc-5905cbdbcf6d760303ca87f27e04824f26976de4.tar.bz2 | |
d: Merge upstream dmd 56f0a65c4.
Updates the Target interface, removing static from all members, so all
field accesses and member function calls go through a single global
'target'. Information relating to extern ABI are now in TargetC,
TargetCPP, and TargetObjC for each supported language respectively.
Reviewed-on: https://github.com/dlang/dmd/pull/11228
gcc/d/ChangeLog:
* dmd/MERGE: Merge upstream dmd 56f0a65c4.
* d-builtins.cc (build_frontend_type): Remove static.
(d_build_builtins_module): Use target.va_listType() to get front-end
type for va_list.
(d_init_builtins): Move creation of va_list to Target::va_listType.
* d-codegen.cc (build_interface_binfo): Use new target global.
(build_vindex_ref): Likewise.
(identity_compare_p): Likewise.
* d-ctfloat.cc (CTFloat::parse): Likewise.
* d-lang.cc (d_init): Likewise.
* d-port.cc (Port::isFloat32LiteralOutOfRange): Likewise.
(Port::isFloat64LiteralOutOfRange): Likewise.
* d-target.cc (define_float_constants): Initialize constants through a
reference, instead of setting globals.
(Target::_init): Initialize new fields instead of setting globals.
(Target::va_listType): Build front-end type from va_list_type_node.
(Target::toCppMangle): Renamed to ...
(TargetCPP::toMangle): ... this.
(Target::cppTypeInfoMangle): Renamed to ...
(TargetCPP::typeInfoMangle): ... this.
(Target::cppTypeMangle): Renamed to ...
(TargetCPP::typeMangle): this.
(Target::cppParameterType): Renamed to ...
(TargetCPP::parameterType): ... this. Use target.va_listType() to get
front-end type for va_list.
(Target::cppFundamentalType): Renamed to ...
(TargetCPP::fundamentalType): ... this.
* d-tree.h (build_frontend_type): Declare.
* decl.cc (base_vtable_offset): Use new target global.
* typeinfo.cc (layout_classinfo_interfaces): Likewise.
(layout_cpp_typeinfo): Likewise.
* types.cc (valist_array_p): Use target.va_listType() to get front-end
type for va_list.
(layout_aggregate_type): Use new target global.
Diffstat (limited to 'gcc/d/decl.cc')
| -rw-r--r-- | gcc/d/decl.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/d/decl.cc b/gcc/d/decl.cc index d5f8797..f2d39a7 100644 --- a/gcc/d/decl.cc +++ b/gcc/d/decl.cc @@ -2011,7 +2011,7 @@ mark_needed (tree decl) unsigned base_vtable_offset (ClassDeclaration *cd, BaseClass *bc) { - unsigned csymoffset = Target::classinfosize; + unsigned csymoffset = target.classinfosize; unsigned interfacesize = int_size_in_bytes (vtbl_interface_type_node); csymoffset += cd->vtblInterfaces->length * interfacesize; @@ -2020,7 +2020,7 @@ base_vtable_offset (ClassDeclaration *cd, BaseClass *bc) BaseClass *b = (*cd->vtblInterfaces)[i]; if (b == bc) return csymoffset; - csymoffset += b->sym->vtbl.length * Target::ptrsize; + csymoffset += b->sym->vtbl.length * target.ptrsize; } /* Check all overriding interface vtbl[]s. */ @@ -2033,7 +2033,7 @@ base_vtable_offset (ClassDeclaration *cd, BaseClass *bc) { if (bc == bs) return csymoffset; - csymoffset += bs->sym->vtbl.length * Target::ptrsize; + csymoffset += bs->sym->vtbl.length * target.ptrsize; } } } |