projects/ldc: ir/irtypestruct.cpp annotate

annotate ir/irtypestruct.cpp @ 1269:b8a51aa44d4c

Added testcase for overlapping struct default initializer I has missed. Slight tweak of the relevant error message.

author	Tomas Lindquist Olsen <tomas.l.olsen gmail com>
date	Mon, 27 Apr 2009 01:43:29 +0200
parents	ec1d9dc1d32a
children	dd135ff697fa

rev	line source
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	1 #include "llvm/DerivedTypes.h"
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	2
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	3 #include "aggregate.h"
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	4 #include "declaration.h"
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	5 #include "mtype.h"
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	6
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	7 #include "gen/irstate.h"
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	8 #include "gen/tollvm.h"
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	9 #include "gen/logger.h"
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	10 #include "gen/utils.h"
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	11 #include "ir/irtypestruct.h"
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	12
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	13 //////////////////////////////////////////////////////////////////////////////
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	14 //////////////////////////////////////////////////////////////////////////////
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	15 //////////////////////////////////////////////////////////////////////////////
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	16
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	17 IrTypeAggr::IrTypeAggr(AggregateDeclaration * ad)
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	18 : IrType(ad->type, llvm::OpaqueType::get()),
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	19 aggr(ad)
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	20 {
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	21 }
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	22
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	23 //////////////////////////////////////////////////////////////////////////////
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	24 //////////////////////////////////////////////////////////////////////////////
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	25 //////////////////////////////////////////////////////////////////////////////
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	26
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	27 IrTypeStruct::IrTypeStruct(StructDeclaration * sd)
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	28 : IrTypeAggr(sd),
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	29 sd(sd),
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	30 ts((TypeStruct*)sd->type)
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	31 {
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	32 }
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	33
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	34 //////////////////////////////////////////////////////////////////////////////
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	35
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	36 size_t add_zeros(std::vector<const llvm::Type*>& defaultTypes, size_t diff)
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	37 {
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	38 size_t n = defaultTypes.size();
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	39 while (diff)
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	40 {
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	41 if (global.params.is64bit && diff % 8 == 0)
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	42 {
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	43 defaultTypes.push_back(llvm::Type::Int64Ty);
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	44 diff -= 8;
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	45 }
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	46 else if (diff % 4 == 0)
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	47 {
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	48 defaultTypes.push_back(llvm::Type::Int32Ty);
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	49 diff -= 4;
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	50 }
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	51 else if (diff % 2 == 0)
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	52 {
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	53 defaultTypes.push_back(llvm::Type::Int16Ty);
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	54 diff -= 2;
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	55 }
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	56 else
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	57 {
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	58 defaultTypes.push_back(llvm::Type::Int8Ty);
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	59 diff -= 1;
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	60 }
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	61 }
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	62 return defaultTypes.size() - n;
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	63 }
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	64
1262 ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	65 bool var_offset_sort_cb(const VarDeclaration* v1, const VarDeclaration* v2)
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	66 {
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	67 if (v1 && v2) return v1->offset < v2->offset;
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	68 else return false;
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	69 }
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	70
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	71 const llvm::Type* IrTypeStruct::buildType()
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	72 {
1262 ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	73 IF_LOG Logger::println("Building struct type %s @ %s",
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	74 sd->toPrettyChars(), sd->locToChars());
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	75 LOG_SCOPE;
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	76
1234 9201e0d41ee5 Fixed forward referenced structs. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1231 diff changeset	77 // if it's a forward declaration, all bets are off, stick with the opaque
9201e0d41ee5 Fixed forward referenced structs. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1231 diff changeset	78 if (sd->sizeok != 1)
9201e0d41ee5 Fixed forward referenced structs. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1231 diff changeset	79 return pa.get();
9201e0d41ee5 Fixed forward referenced structs. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1231 diff changeset	80
1262 ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	81 // mirror the sd->fields array but only fill in contributors
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	82 size_t n = sd->fields.dim;
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	83 LLSmallVector<VarDeclaration*, 16> data(n, NULL);
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	84 default_fields.reserve(n);
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	85
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	86 // first fill in the fields with explicit initializers
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	87 VarDeclarationIter field_it(sd->fields);
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	88 for (; field_it.more(); field_it.next())
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	89 {
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	90 // init is !null for explicit inits
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	91 if (field_it->init != NULL)
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	92 {
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	93 IF_LOG Logger::println("adding explicit initializer for struct field %s",
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	94 field_it->toChars());
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	95
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	96 data[field_it.index] = *field_it;
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	97
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	98 size_t f_begin = field_it->offset;
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	99 size_t f_end = f_begin + field_it->type->size();
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	100
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	101 // make sure there is no overlap
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	102 for (size_t i = 0; i < field_it.index; i++)
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	103 {
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	104 if (data[i] != NULL)
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	105 {
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	106 VarDeclaration* vd = data[i];
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	107 size_t v_begin = vd->offset;
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	108 size_t v_end = v_begin + vd->type->size();
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	109
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	110 if (v_begin >= f_end \|\| v_end <= f_begin)
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	111 continue;
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	112
1269 b8a51aa44d4c Added testcase for overlapping struct default initializer I has missed. Slight tweak of the relevant error message. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1262 diff changeset	113 sd->error(vd->loc, "has overlapping initialization for %s and %s",
1262 ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	114 field_it->toChars(), vd->toChars());
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	115 }
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	116 }
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	117 }
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	118 }
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	119
1262 ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	120 if (global.errors)
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	121 {
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	122 fatal();
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	123 }
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	124
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	125 // fill in default initializers
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	126 field_it = VarDeclarationIter(sd->fields);
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	127 for (;field_it.more(); field_it.next())
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	128 {
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	129 if (data[field_it.index])
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	130 continue;
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	131
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	132 size_t f_begin = field_it->offset;
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	133 size_t f_end = f_begin + field_it->type->size();
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	134
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	135 // make sure it doesn't overlap anything explicit
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	136 bool overlaps = false;
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	137 for (size_t i = 0; i < n; i++)
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	138 {
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	139 if (data[i])
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	140 {
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	141 size_t v_begin = data[i]->offset;
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	142 size_t v_end = v_begin + data[i]->type->size();
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	143
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	144 if (v_begin >= f_end \|\| v_end <= f_begin)
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	145 continue;
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	146
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	147 overlaps = true;
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	148 break;
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	149 }
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	150 }
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	151
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	152 // if no overlap was found, add the default initializer
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	153 if (!overlaps)
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	154 {
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	155 IF_LOG Logger::println("adding default initializer for struct field %s",
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	156 field_it->toChars());
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	157 data[field_it.index] = *field_it;
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	158 }
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	159 }
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	160
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	161 // ok. now we can build a list of llvm types. and make sure zeros are inserted if necessary.
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	162 std::vector<const llvm::Type*> defaultTypes;
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	163 defaultTypes.reserve(16);
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	164
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	165 size_t offset = 0;
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	166 size_t field_index = 0;
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	167
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	168 bool packed = (sd->type->alignsize() == 1);
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	169
1262 ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	170 // first we sort the list by offset
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	171 std::sort(data.begin(), data.end(), var_offset_sort_cb);
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	172
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	173 // add types to list
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	174 for (size_t i = 0; i < n; i++)
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	175 {
1262 ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	176 VarDeclaration* vd = data[i];
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	177
1262 ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	178 if (vd == NULL)
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	179 continue;
1262 ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	180
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	181 assert(vd->offset >= offset);
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	182
1262 ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	183 // add to default field list
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	184 default_fields.push_back(vd);
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	185
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	186 // get next aligned offset for this type
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	187 size_t alignedoffset = offset;
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	188 if (!packed)
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	189 {
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	190 size_t alignsize = vd->type->alignsize();
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	191 alignedoffset = (offset + alignsize - 1) & ~(alignsize - 1);
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	192 }
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	193
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	194 // insert explicit padding?
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	195 if (alignedoffset < vd->offset)
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	196 {
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	197 field_index += add_zeros(defaultTypes, vd->offset - alignedoffset);
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	198 }
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	199
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	200 // add default type
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	201 defaultTypes.push_back(DtoType(vd->type));
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	202
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	203 // advance offset to right past this field
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	204 offset = vd->offset + vd->type->size();
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	205
1262 ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	206 // create ir field
1245 465a77c904d4 Fixed all issues preventing Tango 0.99.8 to compile with `sh build-tango.sh --verbose ldc'. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1234 diff changeset	207 if (vd->ir.irField == NULL)
465a77c904d4 Fixed all issues preventing Tango 0.99.8 to compile with `sh build-tango.sh --verbose ldc'. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1234 diff changeset	208 new IrField(vd, field_index);
1262 ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	209 else
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	210 assert(vd->ir.irField->index == field_index &&
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	211 vd->ir.irField->unionOffset == 0 &&
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	212 "inconsistent field data");
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	213 field_index++;
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	214 }
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	215
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	216 // tail padding?
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	217 if (offset < sd->structsize)
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	218 {
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	219 add_zeros(defaultTypes, sd->structsize - offset);
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	220 }
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	221
1262 ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	222 // make sure all fields really get their ir field
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	223 ArrayIter<VarDeclaration> it(sd->fields);
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	224 for (; !it.done(); it.next())
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	225 {
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	226 VarDeclaration* vd = it.get();
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	227 if (vd->ir.irField == NULL)
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	228 new IrField(vd, 0, vd->offset);
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	229 }
ec1d9dc1d32a Fixed struct default initializers. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	230
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	231 // build the llvm type
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	232 const llvm::Type* st = llvm::StructType::get(defaultTypes, packed);
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	233
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	234 // refine type
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	235 llvm::cast<llvm::OpaqueType>(pa.get())->refineAbstractTypeTo(st);
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	236
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	237 // name types
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	238 Type::sir->getState()->module->addTypeName(sd->toPrettyChars(), pa.get());
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	239
1245 465a77c904d4 Fixed all issues preventing Tango 0.99.8 to compile with `sh build-tango.sh --verbose ldc'. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1234 diff changeset	240 #if 0
1231 212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	241 IF_LOG Logger::cout() << "final struct type: " << *pa.get() << std::endl;
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	242 #endif
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	243
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	244 return pa.get();
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	245 }
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	246
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	247 //////////////////////////////////////////////////////////////////////////////

Mercurial > projects > ldc

annotate ir/irtypestruct.cpp @ 1269:b8a51aa44d4c