projects/ldc: gen/structs.cpp annotate

annotate gen/structs.cpp @ 1231:212ec2d9d176

Fixed some minitest regressions.

author	Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
date	Thu, 16 Apr 2009 19:21:30 +0200
parents	79758fd2f48a
children	9201e0d41ee5

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
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	33 Logger::println("Resolving struct type: %s (%s)", sd->toChars(), sd->locToChars());
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
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	39 // 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	40 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	41 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	42
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	43 // emit the initZ symbol
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	44 LLGlobalVariable* initZ = irstruct->getInitSymbol();
435 74101be2a553 Added type param to DVarValue as DMD sometimes overrides the type of the VarDeclaration. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 351 diff changeset	45
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	46 // perform definition
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	47 if (mustDefineSymbol(sd))
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	48 {
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	49 // set initZ initializer
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	50 initZ->setInitializer(irstruct->getDefaultInit());
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	51 }
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	52
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	53 // emit members
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	54 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	55 {
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	56 ArrayIter<Dsymbol> it(*sd->members);
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	57 while (!it.done())
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	58 {
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	59 Dsymbol* member = it.get();
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	60 if (member)
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	61 member->codegen(Type::sir);
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	62 it.next();
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	63 }
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	64 }
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	65
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	66 // emit typeinfo
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1155 diff changeset	67 DtoTypeInfoOf(sd->type);
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
88 058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	70 //////////////////////////////////////////////////////////////////////////////////////////
344 e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	71 //////////////////////////// D STRUCT UTILITIES ////////////////////////////////////
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	72 //////////////////////////////////////////////////////////////////////////////////////////
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	73
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	74 LLValue* DtoStructEquals(TOK op, DValue* lhs, DValue* rhs)
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	75 {
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	76 Type* t = lhs->getType()->toBasetype();
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	77 assert(t->ty == Tstruct);
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	78
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	79 // set predicate
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	80 llvm::ICmpInst::Predicate cmpop;
345 5320fe65a65d [svn r366] Fixed identity exprs for structs was comparing addresses, not content! lindquist parents: 344 diff changeset	81 if (op == TOKequal \|\| op == TOKidentity)
344 e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	82 cmpop = llvm::ICmpInst::ICMP_EQ;
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	83 else
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	84 cmpop = llvm::ICmpInst::ICMP_NE;
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	85
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	86 // call memcmp
945 03d7c4aac654 SWITCHED TO LLVM 2.5 ! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 940 diff changeset	87 size_t sz = getTypePaddedSize(DtoType(t));
344 e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	88 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	89 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	90 }
1231 212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	91
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	92 //////////////////////////////////////////////////////////////////////////////////////////
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	93
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	94 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	95 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	96 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	97 LOG_SCOPE;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	98
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	99 DtoResolveStruct(sd);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	100
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	101 // vd must be a field
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	102 IrField* field = vd->ir.irField;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	103 assert(field);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	104
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	105 // get the start pointer
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	106 const LLType* st = getPtrToType(DtoType(sd->type));
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	107
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	108 // cast to the formal struct type
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	109 src = DtoBitCast(src, st);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	110
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	111 // gep to the index
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	112 LLValue* val = DtoGEPi(src, 0, field->index);
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 // 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	115 if (field->unionOffset)
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	116 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	117 // cast to void*
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	118 val = DtoBitCast(val, getVoidPtrType());
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	119 // offset
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	120 val = DtoGEPi1(val, field->unionOffset);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	121 }
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 // cast it to the right type
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	124 val = DtoBitCast(val, getPtrToType(DtoType(vd->type)));
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	125
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	126 if (Logger::enabled())
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	127 Logger::cout() << "value: " << *val << '\n';
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	128
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	129 return val;
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
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
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	134 // 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	135 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	136 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	137 size_t n = values.size();
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	138 bool is64 = global.params.is64bit;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	139 while (diff)
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	140 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	141 if (is64 && diff % 8 == 0)
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 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	144 diff -= 8;
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 else if (diff % 4 == 0)
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 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	149 diff -= 4;
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 else if (diff % 2 == 0)
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 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	154 diff -= 2;
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 else
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	157 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	158 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	159 diff -= 1;
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 }
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	162 return values.size() - n;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	163 }
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	164
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	165 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	166 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	167 // get arrays
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	168 size_t nvars = sd->fields.dim;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	169 VarDeclaration vars = (VarDeclaration)sd->fields.data;
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 assert(inits.size() == nvars);
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 // first locate all explicit initializers
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	174 std::vector<VarDeclaration*> explicitInits;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	175 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	176 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	177 if (inits[i])
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	178 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	179 explicitInits.push_back(vars[i]);
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
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	183 // vector of values to build aggregate from
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	184 std::vector<llvm::Value*> values;
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 // offset trackers
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	187 size_t lastoffset = 0;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	188 size_t lastsize = 0;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	189
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	190 // index of next explicit init
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	191 size_t exidx = 0;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	192 // number of explicit inits
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	193 size_t nex = explicitInits.size();
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 // 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	196 size_t i;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	197 for (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 VarDeclaration* var = 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 // get var info
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	202 size_t os = var->offset;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	203 size_t sz = var->type->size();
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 // get next explicit
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	206 VarDeclaration* nextVar = NULL;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	207 size_t nextOs = 0;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	208 if (exidx < nex)
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 nextVar = explicitInits[exidx];
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	211 nextOs = nextVar->offset;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	212 }
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	213 // none, rest is defaults
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	214 else
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	215 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	216 break;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	217 }
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 // 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	220 if (!inits[i])
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	221 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	222 // default init if there is room
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	223 // (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	224 if ((os >= lastoffset + lastsize) && (os+sz <= nextOs))
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	225 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	226 // 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	227 if (os > lastoffset + lastsize)
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	228 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	229 //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	230 add_zeros(values, os - lastoffset - lastsize);
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
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	233 // get field default init
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	234 IrField* f = var->ir.irField;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	235 assert(f);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	236 values.push_back(f->getDefaultInit());
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 lastoffset = os;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	239 lastsize = sz;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	240 //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	241 }
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	242 // skip
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	243 continue;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	244 }
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 assert(nextVar == var);
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("added %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 // add the expression value
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	256 values.push_back(inits[i]);
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 // update offsets
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	259 lastoffset = os;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	260 lastsize = 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 // go to next explicit init
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	263 exidx++;
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 //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	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 // fill out rest with default initializers
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	269 const LLType* structtype = DtoType(sd->type);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	270 size_t structsize = getTypePaddedSize(structtype);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	271
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	272 // 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	273 if (structsize > lastoffset+lastsize)
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 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	276 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	277 VarDeclaration* var = vars[i];
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	278
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	279 // get var info
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	280 size_t os = var->offset;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	281 size_t sz = var->type->size();
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	282
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	283 // skip?
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	284 if (os < lastoffset + lastsize)
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	285 continue;
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 // 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	288 if (os > lastoffset + lastsize)
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 //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	291 add_zeros(values, os - lastoffset - lastsize);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	292 }
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 // get field default init
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	295 IrField* f = var->ir.irField;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	296 assert(f);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	297 values.push_back(f->getDefaultInit());
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 lastoffset = os;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	300 lastsize = sz;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	301 //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	302 }
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	303 }
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 // 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	306 if (structsize > lastoffset+lastsize)
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	307 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	308 //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	309 add_zeros(values, structsize - lastoffset - lastsize);
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	310 }
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 return values;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	313 }

Mercurial > projects > ldc

annotate gen/structs.cpp @ 1231:212ec2d9d176