projects/ldc: gen/structs.cpp annotate

annotate gen/structs.cpp @ 1650:40bd4a0d4870

Update to work with LLVM 2.7. Removed use of dyn_cast, llvm no compiles without exceptions and rtti by default. We do need exceptions for the libconfig stuff, but rtti isn't necessary (anymore). Debug info needs to be rewritten, as in LLVM 2.7 the format has completely changed. To have something to look at while rewriting, the old code has been wrapped inside #ifndef DISABLE_DEBUG_INFO , this means that you have to define this to compile at the moment. Updated tango 0.99.9 patch to include updated EH runtime code, which is needed for LLVM 2.7 as well.

author	Tomas Lindquist Olsen
date	Wed, 19 May 2010 12:42:32 +0200
parents	8d086d552909
children

rev	line source
88 058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	1 #include <algorithm>
058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	2
058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	3 #include "gen/llvm.h"
1353 45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	4 #include "llvm/AbstractTypeUser.h"
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	5 #include "llvm/ADT/DenseMap.h"
88 058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	6
058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	7 #include "mtype.h"
058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	8 #include "aggregate.h"
058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	9 #include "init.h"
058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	10 #include "declaration.h"
058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	11
058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	12 #include "gen/irstate.h"
058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	13 #include "gen/tollvm.h"
244 a95056b3c996 [svn r261] Fixed debug info for integer and floating local variables, can now be inspected in GDB. lindquist parents: 217 diff changeset	14 #include "gen/llvmhelpers.h"
88 058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	15 #include "gen/arrays.h"
058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	16 #include "gen/logger.h"
058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	17 #include "gen/structs.h"
344 e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	18 #include "gen/dvalue.h"
1155 ba9d6292572a Fixed forward reference problem in struct methods on x86-64. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1151 diff changeset	19 #include "gen/functions.h"
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	20 #include "gen/utils.h"
88 058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	21
136 0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	22 #include "ir/irstruct.h"
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	23 #include "ir/irtypestruct.h"
870 af7a6faf9406 Fix #153. Factor out common code in StructLiteralExp::to(Const)Elem. Christian Kamm <kamm incasoftware de> parents: 840 diff changeset	24
af7a6faf9406 Fix #153. Factor out common code in StructLiteralExp::to(Const)Elem. Christian Kamm <kamm incasoftware de> parents: 840 diff changeset	25 //////////////////////////////////////////////////////////////////////////////////////////
af7a6faf9406 Fix #153. Factor out common code in StructLiteralExp::to(Const)Elem. Christian Kamm <kamm incasoftware de> parents: 840 diff changeset	26
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	27 void DtoResolveStruct(StructDeclaration* sd)
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	28 {
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	29 // don't do anything if already been here
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 171 diff changeset	30 if (sd->ir.resolved) return;
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	31 // make sure above works :P
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 171 diff changeset	32 sd->ir.resolved = true;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	33
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	34 // log what we're doing
1278 8fb39f7f1a7c Fixed file name in imported mixins containing assertions. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1270 diff changeset	35 Logger::println("Resolving struct type: %s (%s)", sd->toChars(), sd->loc.toChars());
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	36 LOG_SCOPE;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	37
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	38 // make sure type exists
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	39 DtoType(sd->type);
171 95f07e3f8bb9 [svn r187] Fixed missing definitions of instances of imported struct template declarations. lindquist parents: 169 diff changeset	40
1234 9201e0d41ee5 Fixed forward referenced structs. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1231 diff changeset	41 // if it's a forward declaration, all bets are off. The type should be enough
9201e0d41ee5 Fixed forward referenced structs. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1231 diff changeset	42 if (sd->sizeok != 1)
9201e0d41ee5 Fixed forward referenced structs. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1231 diff changeset	43 return;
9201e0d41ee5 Fixed forward referenced structs. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1231 diff changeset	44
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	45 // create the IrStruct
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	46 IrStruct* irstruct = new IrStruct(sd);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	47 sd->ir.irStruct = irstruct;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	48
1309 0c03ba6f7c24 Fixed deal breaker bug for more-at-once compilation when any module contained aggregates. Fixes ticket #272 . Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1278 diff changeset	49 // make sure all fields really get their ir field
0c03ba6f7c24 Fixed deal breaker bug for more-at-once compilation when any module contained aggregates. Fixes ticket #272 . Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1278 diff changeset	50 ArrayIter<VarDeclaration> it(sd->fields);
0c03ba6f7c24 Fixed deal breaker bug for more-at-once compilation when any module contained aggregates. Fixes ticket #272 . Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1278 diff changeset	51 for (; !it.done(); it.next())
0c03ba6f7c24 Fixed deal breaker bug for more-at-once compilation when any module contained aggregates. Fixes ticket #272 . Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1278 diff changeset	52 {
0c03ba6f7c24 Fixed deal breaker bug for more-at-once compilation when any module contained aggregates. Fixes ticket #272 . Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1278 diff changeset	53 VarDeclaration* vd = it.get();
0c03ba6f7c24 Fixed deal breaker bug for more-at-once compilation when any module contained aggregates. Fixes ticket #272 . Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1278 diff changeset	54 if (vd->ir.irField == NULL) {
0c03ba6f7c24 Fixed deal breaker bug for more-at-once compilation when any module contained aggregates. Fixes ticket #272 . Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1278 diff changeset	55 new IrField(vd);
0c03ba6f7c24 Fixed deal breaker bug for more-at-once compilation when any module contained aggregates. Fixes ticket #272 . Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1278 diff changeset	56 } else {
0c03ba6f7c24 Fixed deal breaker bug for more-at-once compilation when any module contained aggregates. Fixes ticket #272 . Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1278 diff changeset	57 IF_LOG Logger::println("struct field already exists!!!");
0c03ba6f7c24 Fixed deal breaker bug for more-at-once compilation when any module contained aggregates. Fixes ticket #272 . Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1278 diff changeset	58 }
0c03ba6f7c24 Fixed deal breaker bug for more-at-once compilation when any module contained aggregates. Fixes ticket #272 . Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1278 diff changeset	59 }
0c03ba6f7c24 Fixed deal breaker bug for more-at-once compilation when any module contained aggregates. Fixes ticket #272 . Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1278 diff changeset	60
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	61 // perform definition
1238 3ddec21fe2b6 Make typeinfo for struct Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1234 diff changeset	62 bool needs_def = mustDefineSymbol(sd);
3ddec21fe2b6 Make typeinfo for struct Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1234 diff changeset	63 if (needs_def)
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	64 {
1270 dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1238 diff changeset	65 // emit the initZ symbol
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1238 diff changeset	66 LLGlobalVariable* initZ = irstruct->getInitSymbol();
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1238 diff changeset	67
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	68 // set initZ initializer
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	69 initZ->setInitializer(irstruct->getDefaultInit());
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	70 }
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	71
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	72 // emit members
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	73 if (sd->members)
1155 ba9d6292572a Fixed forward reference problem in struct methods on x86-64. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1151 diff changeset	74 {
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	75 ArrayIter<Dsymbol> it(*sd->members);
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	76 while (!it.done())
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	77 {
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	78 Dsymbol* member = it.get();
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	79 if (member)
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	80 member->codegen(Type::sir);
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	81 it.next();
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	82 }
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	83 }
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	84
1238 3ddec21fe2b6 Make typeinfo for struct Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1234 diff changeset	85 if (needs_def)
3ddec21fe2b6 Make typeinfo for struct Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1234 diff changeset	86 {
3ddec21fe2b6 Make typeinfo for struct Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1234 diff changeset	87 // emit typeinfo
3ddec21fe2b6 Make typeinfo for struct Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1234 diff changeset	88 DtoTypeInfoOf(sd->type);
3ddec21fe2b6 Make typeinfo for struct Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1234 diff changeset	89 }
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	90 }
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	91
88 058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	92 //////////////////////////////////////////////////////////////////////////////////////////
344 e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	93 //////////////////////////// D STRUCT UTILITIES ////////////////////////////////////
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	94 //////////////////////////////////////////////////////////////////////////////////////////
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	95
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	96 LLValue* DtoStructEquals(TOK op, DValue* lhs, DValue* rhs)
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	97 {
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	98 Type* t = lhs->getType()->toBasetype();
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	99 assert(t->ty == Tstruct);
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	100
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	101 // set predicate
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	102 llvm::ICmpInst::Predicate cmpop;
345 5320fe65a65d [svn r366] Fixed identity exprs for structs was comparing addresses, not content! lindquist parents: 344 diff changeset	103 if (op == TOKequal \|\| op == TOKidentity)
344 e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	104 cmpop = llvm::ICmpInst::ICMP_EQ;
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	105 else
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	106 cmpop = llvm::ICmpInst::ICMP_NE;
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	107
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	108 // call memcmp
945 03d7c4aac654 SWITCHED TO LLVM 2.5 ! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 940 diff changeset	109 size_t sz = getTypePaddedSize(DtoType(t));
344 e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	110 LLValue* val = DtoMemCmp(lhs->getRVal(), rhs->getRVal(), DtoConstSize_t(sz));
1554 d6e8d5db259f LLVMContext changes up to r77366 Benjamin Kramer <benny.kra@gmail.com> parents: 1545 diff changeset	111 return gIR->ir->CreateICmp(cmpop, val, LLConstantInt::get(val->getType(), 0, false), "tmp");
344 e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	112 }
1231 212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	113
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	114 //////////////////////////////////////////////////////////////////////////////////////////
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	115
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	116 LLValue* DtoIndexStruct(LLValue* src, StructDeclaration* sd, VarDeclaration* vd)
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	117 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	118 Logger::println("indexing struct field %s:", vd->toPrettyChars());
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	119 LOG_SCOPE;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	120
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	121 DtoResolveStruct(sd);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	122
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	123 // vd must be a field
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	124 IrField* field = vd->ir.irField;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	125 assert(field);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	126
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	127 // get the start pointer
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	128 const LLType* st = getPtrToType(DtoType(sd->type));
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	129
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	130 // cast to the formal struct type
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	131 src = DtoBitCast(src, st);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	132
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	133 // gep to the index
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	134 LLValue* val = DtoGEPi(src, 0, field->index);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	135
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	136 // do we need to offset further? (union area)
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	137 if (field->unionOffset)
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	138 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	139 // cast to void*
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	140 val = DtoBitCast(val, getVoidPtrType());
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	141 // offset
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	142 val = DtoGEPi1(val, field->unionOffset);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	143 }
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	144
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	145 // cast it to the right type
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	146 val = DtoBitCast(val, getPtrToType(DtoType(vd->type)));
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	147
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	148 if (Logger::enabled())
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	149 Logger::cout() << "value: " << *val << '\n';
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	150
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	151 return val;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	152 }
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	153
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	154 //////////////////////////////////////////////////////////////////////////////////////////
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	155
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	156 // helper function that adds zero bytes to a vector of constants
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	157 size_t add_zeros(std::vector<llvm::Value*>& values, size_t diff)
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	158 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	159 size_t n = values.size();
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	160 bool is64 = global.params.is64bit;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	161 while (diff)
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	162 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	163 if (is64 && diff % 8 == 0)
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	164 {
1571 8d086d552909 IntegerType is now contextifed. Benjamin Kramer <benny.kra@gmail.com> parents: 1569 diff changeset	165 values.push_back(LLConstant::getNullValue(llvm::Type::getInt64Ty(gIR->context())));
1231 212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	166 diff -= 8;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	167 }
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	168 else if (diff % 4 == 0)
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	169 {
1571 8d086d552909 IntegerType is now contextifed. Benjamin Kramer <benny.kra@gmail.com> parents: 1569 diff changeset	170 values.push_back(LLConstant::getNullValue(llvm::Type::getInt32Ty(gIR->context())));
1231 212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	171 diff -= 4;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	172 }
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	173 else if (diff % 2 == 0)
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	174 {
1571 8d086d552909 IntegerType is now contextifed. Benjamin Kramer <benny.kra@gmail.com> parents: 1569 diff changeset	175 values.push_back(LLConstant::getNullValue(llvm::Type::getInt16Ty(gIR->context())));
1231 212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	176 diff -= 2;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	177 }
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	178 else
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	179 {
1571 8d086d552909 IntegerType is now contextifed. Benjamin Kramer <benny.kra@gmail.com> parents: 1569 diff changeset	180 values.push_back(LLConstant::getNullValue(llvm::Type::getInt8Ty(gIR->context())));
1231 212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	181 diff -= 1;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	182 }
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	183 }
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	184 return values.size() - n;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	185 }
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	186
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	187 std::vector<llvm::Value> DtoStructLiteralValues(const StructDeclaration sd, const std::vector<llvm::Value*>& inits)
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	188 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	189 // get arrays
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	190 size_t nvars = sd->fields.dim;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	191 VarDeclaration vars = (VarDeclaration)sd->fields.data;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	192
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	193 assert(inits.size() == nvars);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	194
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	195 // first locate all explicit initializers
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	196 std::vector<VarDeclaration*> explicitInits;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	197 for (size_t i=0; i < nvars; i++)
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	198 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	199 if (inits[i])
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	200 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	201 explicitInits.push_back(vars[i]);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	202 }
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	203 }
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	204
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	205 // vector of values to build aggregate from
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	206 std::vector<llvm::Value*> values;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	207
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	208 // offset trackers
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	209 size_t lastoffset = 0;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	210 size_t lastsize = 0;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	211
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	212 // index of next explicit init
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	213 size_t exidx = 0;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	214 // number of explicit inits
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	215 size_t nex = explicitInits.size();
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	216
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	217 // for through each field and build up the struct, padding with zeros
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	218 size_t i;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	219 for (i=0; i<nvars; i++)
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	220 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	221 VarDeclaration* var = vars[i];
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	222
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	223 // get var info
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	224 size_t os = var->offset;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	225 size_t sz = var->type->size();
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	226
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	227 // get next explicit
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	228 VarDeclaration* nextVar = NULL;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	229 size_t nextOs = 0;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	230 if (exidx < nex)
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	231 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	232 nextVar = explicitInits[exidx];
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	233 nextOs = nextVar->offset;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	234 }
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	235 // none, rest is defaults
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	236 else
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	237 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	238 break;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	239 }
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	240
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	241 // not explicit initializer, default initialize if there is room, otherwise skip
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	242 if (!inits[i])
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	243 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	244 // default init if there is room
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	245 // (past current offset) and (small enough to fit before next explicit)
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	246 if ((os >= lastoffset + lastsize) && (os+sz <= nextOs))
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	247 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	248 // add any 0 padding needed before this field
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	249 if (os > lastoffset + lastsize)
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	250 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	251 //printf("1added %lu zeros\n", os - lastoffset - lastsize);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	252 add_zeros(values, os - lastoffset - lastsize);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	253 }
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	254
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	255 // get field default init
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	256 IrField* f = var->ir.irField;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	257 assert(f);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	258 values.push_back(f->getDefaultInit());
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	259
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	260 lastoffset = os;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	261 lastsize = sz;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	262 //printf("added default: %s : %lu (%lu)\n", var->toChars(), os, sz);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	263 }
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	264 // skip
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	265 continue;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	266 }
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	267
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	268 assert(nextVar == var);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	269
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	270 // add any 0 padding needed before this field
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	271 if (os > lastoffset + lastsize)
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	272 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	273 //printf("added %lu zeros\n", os - lastoffset - lastsize);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	274 add_zeros(values, os - lastoffset - lastsize);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	275 }
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	276
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	277 // add the expression value
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	278 values.push_back(inits[i]);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	279
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	280 // update offsets
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	281 lastoffset = os;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	282 lastsize = sz;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	283
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	284 // go to next explicit init
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	285 exidx++;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	286
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	287 //printf("added field: %s : %lu (%lu)\n", var->toChars(), os, sz);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	288 }
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	289
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	290 // fill out rest with default initializers
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	291 const LLType* structtype = DtoType(sd->type);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	292 size_t structsize = getTypePaddedSize(structtype);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	293
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	294 // FIXME: this could probably share some code with the above
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	295 if (structsize > lastoffset+lastsize)
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	296 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	297 for (/continue from first loop/; i < nvars; i++)
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	298 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	299 VarDeclaration* var = vars[i];
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	300
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	301 // get var info
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	302 size_t os = var->offset;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	303 size_t sz = var->type->size();
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	304
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	305 // skip?
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	306 if (os < lastoffset + lastsize)
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	307 continue;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	308
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	309 // add any 0 padding needed before this field
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	310 if (os > lastoffset + lastsize)
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	311 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	312 //printf("2added %lu zeros\n", os - lastoffset - lastsize);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	313 add_zeros(values, os - lastoffset - lastsize);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	314 }
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	315
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	316 // get field default init
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	317 IrField* f = var->ir.irField;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	318 assert(f);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	319 values.push_back(f->getDefaultInit());
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	320
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	321 lastoffset = os;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	322 lastsize = sz;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	323 //printf("2added default: %s : %lu (%lu)\n", var->toChars(), os, sz);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	324 }
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	325 }
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	326
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	327 // add any 0 padding needed at the end of the literal
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	328 if (structsize > lastoffset+lastsize)
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	329 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	330 //printf("3added %lu zeros\n", structsize - lastoffset - lastsize);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	331 add_zeros(values, structsize - lastoffset - lastsize);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	332 }
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	333
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	334 return values;
1312 c8b9406d84ca Add newline to get rid of warning. Christian Kamm <kamm incasoftware de> parents: 1309 diff changeset	335 }
c8b9406d84ca Add newline to get rid of warning. Christian Kamm <kamm incasoftware de> parents: 1309 diff changeset	336
1353 45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	337 /// Return the type returned by DtoUnpaddedStruct called on a value of the
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	338 /// specified type.
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	339 /// Union types will get expanded into a struct, with a type for each member.
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	340 LLType* DtoUnpaddedStructType(Type* dty) {
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	341 assert(dty->ty == Tstruct);
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	342
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	343 typedef llvm::DenseMap<Type*, llvm::PATypeHolder> CacheT;
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	344 static CacheT cache;
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	345 CacheT::iterator it = cache.find(dty);
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	346 if (it != cache.end())
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	347 return it->second;
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	348
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	349 TypeStruct* sty = (TypeStruct*) dty;
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	350 Array& fields = sty->sym->fields;
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	351
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	352 std::vector<const LLType*> types;
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	353
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	354 for (unsigned i = 0; i < fields.dim; i++) {
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	355 VarDeclaration* vd = (VarDeclaration*) fields.data[i];
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	356 const LLType* fty;
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	357 if (vd->type->ty == Tstruct) {
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	358 // Nested structs are the only members that can contain padding
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	359 fty = DtoUnpaddedStructType(vd->type);
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	360 } else {
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	361 fty = DtoType(vd->type);
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	362 }
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	363 types.push_back(fty);
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	364 }
1569 755abafbf25d Push the context through StructType::get. Benjamin Kramer <benny.kra@gmail.com> parents: 1560 diff changeset	365 LLType* Ty = LLStructType::get(gIR->context(), types);
1353 45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	366 cache.insert(std::make_pair(dty, Ty));
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	367 return Ty;
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	368 }
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	369
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	370 /// Return the struct value represented by v without the padding fields.
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	371 /// Unions will be expanded, with a value for each member.
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	372 /// Note: v must be a pointer to a struct, but the return value will be a
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	373 /// first-class struct value.
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	374 LLValue* DtoUnpaddedStruct(Type* dty, LLValue* v) {
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	375 assert(dty->ty == Tstruct);
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	376 TypeStruct* sty = (TypeStruct*) dty;
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	377 Array& fields = sty->sym->fields;
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	378
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	379 LLValue* newval = llvm::UndefValue::get(DtoUnpaddedStructType(dty));
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	380
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	381 for (unsigned i = 0; i < fields.dim; i++) {
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	382 VarDeclaration* vd = (VarDeclaration*) fields.data[i];
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	383 LLValue* fieldptr = DtoIndexStruct(v, sty->sym, vd);
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	384 LLValue* fieldval;
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	385 if (vd->type->ty == Tstruct) {
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	386 // Nested structs are the only members that can contain padding
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	387 fieldval = DtoUnpaddedStruct(vd->type, fieldptr);
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	388 } else {
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	389 fieldval = DtoLoad(fieldptr);
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	390 }
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	391 newval = DtoInsertValue(newval, fieldval, i);
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	392 }
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	393 return newval;
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	394 }
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	395
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	396 /// Undo the transformation performed by DtoUnpaddedStruct, writing to lval.
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	397 void DtoPaddedStruct(Type* dty, LLValue* v, LLValue* lval) {
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	398 assert(dty->ty == Tstruct);
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	399 TypeStruct* sty = (TypeStruct*) dty;
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	400 Array& fields = sty->sym->fields;
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	401
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	402 for (unsigned i = 0; i < fields.dim; i++) {
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	403 VarDeclaration* vd = (VarDeclaration*) fields.data[i];
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	404 LLValue* fieldptr = DtoIndexStruct(lval, sty->sym, vd);
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	405 LLValue* fieldval = DtoExtractValue(v, i);
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	406 if (vd->type->ty == Tstruct) {
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	407 // Nested structs are the only members that can contain padding
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	408 DtoPaddedStruct(vd->type, fieldval, fieldptr);
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	409 } else {
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	410 DtoStore(fieldval, fieldptr);
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	411 }
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	412 }
45aca7e7cc88 Remove struct padding when passing or returning in registers on x86-64 (extern(D) only) Frits van Bommel <fvbommel wxs.nl> parents: 1312 diff changeset	413 }

Mercurial > projects > ldc

annotate gen/structs.cpp @ 1650:40bd4a0d4870