projects/ldc: gen/structs.cpp annotate

annotate gen/structs.cpp @ 1351:8d501abecd24

Initial (but disabled) fix for ticket #294 , the actual part that fixes the bug is in a #if 0 block as I'm afraid it will cause regressions. I'm most likely not going to be around tonight, and maybe not tomorrow as well, so I'm pushing it in case someone wants to run some serious testing/investigate the problem noted in llvmhelpers.cpp : realignOffset .

author	Tomas Lindquist Olsen <tomas.l.olsen gmail com>
date	Thu, 14 May 2009 17:20:17 +0200
parents	c8b9406d84ca
children	45aca7e7cc88

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"
058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	4
058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	5 #include "mtype.h"
058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	6 #include "aggregate.h"
058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	7 #include "init.h"
058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	8 #include "declaration.h"
058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	9
058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	10 #include "gen/irstate.h"
058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	11 #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	12 #include "gen/llvmhelpers.h"
88 058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	13 #include "gen/arrays.h"
058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	14 #include "gen/logger.h"
058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	15 #include "gen/structs.h"
344 e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	16 #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	17 #include "gen/functions.h"
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	18 #include "gen/utils.h"
88 058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	19
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	20 #include "ir/irstruct.h"
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	21 #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	22
af7a6faf9406 Fix #153. Factor out common code in StructLiteralExp::to(Const)Elem. Christian Kamm <kamm incasoftware de> parents: 840 diff changeset	23 //////////////////////////////////////////////////////////////////////////////////////////
af7a6faf9406 Fix #153. Factor out common code in StructLiteralExp::to(Const)Elem. Christian Kamm <kamm incasoftware de> parents: 840 diff changeset	24
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	25 void DtoResolveStruct(StructDeclaration* sd)
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	26 {
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	27 // 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	28 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	29 // make sure above works :P
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 171 diff changeset	30 sd->ir.resolved = true;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	31
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	32 // 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	33 Logger::println("Resolving struct type: %s (%s)", sd->toChars(), sd->loc.toChars());
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	34 LOG_SCOPE;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	35
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	36 // make sure type exists
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	37 DtoType(sd->type);
171 95f07e3f8bb9 [svn r187] Fixed missing definitions of instances of imported struct template declarations. lindquist parents: 169 diff changeset	38
1234 9201e0d41ee5 Fixed forward referenced structs. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1231 diff changeset	39 // 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	40 if (sd->sizeok != 1)
9201e0d41ee5 Fixed forward referenced structs. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1231 diff changeset	41 return;
9201e0d41ee5 Fixed forward referenced structs. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1231 diff changeset	42
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	43 // 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	44 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	45 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	46
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	47 // 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	48 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	49 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	50 {
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 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	52 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	53 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	54 } 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	55 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	56 }
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 }
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
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	59 // perform definition
1238 3ddec21fe2b6 Make typeinfo for struct Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1234 diff changeset	60 bool needs_def = mustDefineSymbol(sd);
3ddec21fe2b6 Make typeinfo for struct Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1234 diff changeset	61 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	62 {
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	63 // 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	64 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	65
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	66 // set initZ initializer
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	67 initZ->setInitializer(irstruct->getDefaultInit());
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	68 }
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	69
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	70 // emit members
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	71 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	72 {
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	73 ArrayIter<Dsymbol> it(*sd->members);
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	74 while (!it.done())
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	75 {
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	76 Dsymbol* member = it.get();
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	77 if (member)
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	78 member->codegen(Type::sir);
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	79 it.next();
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	80 }
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	81 }
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	82
1238 3ddec21fe2b6 Make typeinfo for struct Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1234 diff changeset	83 if (needs_def)
3ddec21fe2b6 Make typeinfo for struct Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1234 diff changeset	84 {
3ddec21fe2b6 Make typeinfo for struct Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1234 diff changeset	85 // emit typeinfo
3ddec21fe2b6 Make typeinfo for struct Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1234 diff changeset	86 DtoTypeInfoOf(sd->type);
3ddec21fe2b6 Make typeinfo for struct Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1234 diff changeset	87 }
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	88 }
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	89
88 058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	90 //////////////////////////////////////////////////////////////////////////////////////////
344 e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	91 //////////////////////////// D STRUCT UTILITIES ////////////////////////////////////
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	92 //////////////////////////////////////////////////////////////////////////////////////////
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	93
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	94 LLValue* DtoStructEquals(TOK op, DValue* lhs, DValue* rhs)
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 Type* t = lhs->getType()->toBasetype();
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	97 assert(t->ty == Tstruct);
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	98
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	99 // set predicate
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	100 llvm::ICmpInst::Predicate cmpop;
345 5320fe65a65d [svn r366] Fixed identity exprs for structs was comparing addresses, not content! lindquist parents: 344 diff changeset	101 if (op == TOKequal \|\| op == TOKidentity)
344 e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	102 cmpop = llvm::ICmpInst::ICMP_EQ;
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	103 else
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	104 cmpop = llvm::ICmpInst::ICMP_NE;
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	105
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	106 // call memcmp
945 03d7c4aac654 SWITCHED TO LLVM 2.5 ! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 940 diff changeset	107 size_t sz = getTypePaddedSize(DtoType(t));
344 e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	108 LLValue* val = DtoMemCmp(lhs->getRVal(), rhs->getRVal(), DtoConstSize_t(sz));
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	109 return gIR->ir->CreateICmp(cmpop, val, LLConstantInt::get(val->getType(), 0, false), "tmp");
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	110 }
1231 212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	111
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	112 //////////////////////////////////////////////////////////////////////////////////////////
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 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	115 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	116 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	117 LOG_SCOPE;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	118
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	119 DtoResolveStruct(sd);
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 // vd must be a field
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	122 IrField* field = vd->ir.irField;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	123 assert(field);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	124
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	125 // get the start pointer
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	126 const LLType* st = getPtrToType(DtoType(sd->type));
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	127
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	128 // cast to the formal struct type
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	129 src = DtoBitCast(src, st);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	130
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	131 // gep to the index
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	132 LLValue* val = DtoGEPi(src, 0, field->index);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	133
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	134 // 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	135 if (field->unionOffset)
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	136 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	137 // cast to void*
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	138 val = DtoBitCast(val, getVoidPtrType());
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	139 // offset
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	140 val = DtoGEPi1(val, field->unionOffset);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	141 }
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	142
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	143 // cast it to the right type
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	144 val = DtoBitCast(val, getPtrToType(DtoType(vd->type)));
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	145
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	146 if (Logger::enabled())
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	147 Logger::cout() << "value: " << *val << '\n';
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	148
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	149 return val;
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
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 // 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	155 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	156 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	157 size_t n = values.size();
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	158 bool is64 = global.params.is64bit;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	159 while (diff)
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	160 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	161 if (is64 && diff % 8 == 0)
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 values.push_back(llvm::Constant::getNullValue(llvm::Type::Int64Ty));
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	164 diff -= 8;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	165 }
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	166 else if (diff % 4 == 0)
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 values.push_back(llvm::Constant::getNullValue(llvm::Type::Int32Ty));
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	169 diff -= 4;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	170 }
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	171 else if (diff % 2 == 0)
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 values.push_back(llvm::Constant::getNullValue(llvm::Type::Int16Ty));
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	174 diff -= 2;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	175 }
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	176 else
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 values.push_back(llvm::Constant::getNullValue(llvm::Type::Int8Ty));
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	179 diff -= 1;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	180 }
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	181 }
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	182 return values.size() - n;
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
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	185 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	186 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	187 // get arrays
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	188 size_t nvars = sd->fields.dim;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	189 VarDeclaration vars = (VarDeclaration)sd->fields.data;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	190
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	191 assert(inits.size() == nvars);
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 // first locate all explicit initializers
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	194 std::vector<VarDeclaration*> explicitInits;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	195 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	196 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	197 if (inits[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 explicitInits.push_back(vars[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 }
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 // vector of values to build aggregate from
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	204 std::vector<llvm::Value*> values;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	205
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	206 // offset trackers
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	207 size_t lastoffset = 0;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	208 size_t lastsize = 0;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	209
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	210 // index of next explicit init
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	211 size_t exidx = 0;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	212 // number of explicit inits
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	213 size_t nex = explicitInits.size();
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	214
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	215 // 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	216 size_t i;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	217 for (i=0; i<nvars; i++)
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	218 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	219 VarDeclaration* var = vars[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 // get var info
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	222 size_t os = var->offset;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	223 size_t sz = var->type->size();
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	224
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	225 // get next explicit
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	226 VarDeclaration* nextVar = NULL;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	227 size_t nextOs = 0;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	228 if (exidx < nex)
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	229 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	230 nextVar = explicitInits[exidx];
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	231 nextOs = nextVar->offset;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	232 }
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	233 // none, rest is defaults
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	234 else
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	235 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	236 break;
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
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	239 // 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	240 if (!inits[i])
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	241 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	242 // default init if there is room
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	243 // (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	244 if ((os >= lastoffset + lastsize) && (os+sz <= nextOs))
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	245 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	246 // 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	247 if (os > lastoffset + lastsize)
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	248 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	249 //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	250 add_zeros(values, os - lastoffset - lastsize);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	251 }
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	252
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	253 // get field default init
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	254 IrField* f = var->ir.irField;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	255 assert(f);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	256 values.push_back(f->getDefaultInit());
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	257
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	258 lastoffset = os;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	259 lastsize = sz;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	260 //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	261 }
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	262 // skip
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	263 continue;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	264 }
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	265
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	266 assert(nextVar == var);
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 // 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	269 if (os > lastoffset + lastsize)
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	270 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	271 //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	272 add_zeros(values, os - lastoffset - lastsize);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	273 }
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	274
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	275 // add the expression value
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	276 values.push_back(inits[i]);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	277
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	278 // update offsets
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	279 lastoffset = os;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	280 lastsize = sz;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	281
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	282 // go to next explicit init
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	283 exidx++;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	284
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	285 //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	286 }
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	287
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	288 // fill out rest with default initializers
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	289 const LLType* structtype = DtoType(sd->type);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	290 size_t structsize = getTypePaddedSize(structtype);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	291
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	292 // 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	293 if (structsize > lastoffset+lastsize)
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	294 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	295 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	296 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	297 VarDeclaration* var = vars[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 // get var info
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	300 size_t os = var->offset;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	301 size_t sz = var->type->size();
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	302
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	303 // skip?
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	304 if (os < lastoffset + lastsize)
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	305 continue;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	306
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	307 // 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	308 if (os > lastoffset + lastsize)
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	309 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	310 //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	311 add_zeros(values, os - lastoffset - lastsize);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	312 }
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	313
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	314 // get field default init
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	315 IrField* f = var->ir.irField;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	316 assert(f);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	317 values.push_back(f->getDefaultInit());
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	318
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	319 lastoffset = os;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	320 lastsize = sz;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	321 //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	322 }
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	323 }
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 // 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	326 if (structsize > lastoffset+lastsize)
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	327 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	328 //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	329 add_zeros(values, structsize - lastoffset - lastsize);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	330 }
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	331
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	332 return values;
1312 c8b9406d84ca Add newline to get rid of warning. Christian Kamm <kamm incasoftware de> parents: 1309 diff changeset	333 }
c8b9406d84ca Add newline to get rid of warning. Christian Kamm <kamm incasoftware de> parents: 1309 diff changeset	334

Mercurial > projects > ldc

annotate gen/structs.cpp @ 1351:8d501abecd24