projects/ldc: ir/irtypeclass.cpp annotate

annotate ir/irtypeclass.cpp @ 1309:0c03ba6f7c24

Fixed deal breaker bug for more-at-once compilation when any module contained aggregates. Fixes ticket #272 .

author	Tomas Lindquist Olsen <tomas.l.olsen gmail com>
date	Thu, 07 May 2009 02:10:29 +0200
parents	8fb39f7f1a7c
children	49fd0c8040e6

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 "dsymbol.h"
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	6 #include "mtype.h"
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	7
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	8 #include "gen/irstate.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/tollvm.h"
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	11 #include "gen/utils.h"
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	12 #include "ir/irtypeclass.h"
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 extern size_t add_zeros(std::vector<const llvm::Type*>& defaultTypes, size_t diff);
1270 dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	17 extern bool var_offset_sort_cb(const VarDeclaration* v1, const VarDeclaration* v2);
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	18
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	19 //////////////////////////////////////////////////////////////////////////////
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 IrTypeClass::IrTypeClass(ClassDeclaration* cd)
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	22 : IrTypeAggr(cd),
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	23 cd(cd),
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	24 tc((TypeClass*)cd->type),
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	25 vtbl_pa(llvm::OpaqueType::get())
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 vtbl_size = cd->vtbl.dim;
1230 e67c85d6e680 Completed interface implementation. Hopefully that's it for now.. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	28 num_interface_vtbls = 0;
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	29 }
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	30
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 void IrTypeClass::addBaseClassData(
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	34 std::vector< const llvm::Type * > & defaultTypes,
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	35 ClassDeclaration * base,
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	36 size_t & offset,
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	37 size_t & field_index)
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	38 {
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	39 if (base->baseClass)
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 addBaseClassData(defaultTypes, base->baseClass, offset, field_index);
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
1270 dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	44 // FIXME: merge code with structs in IrTypeAggr
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	45
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	46 // mirror the sd->fields array but only fill in contributors
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	47 size_t n = base->fields.dim;
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	48 LLSmallVector<VarDeclaration*, 16> data(n, NULL);
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	49 default_fields.reserve(n);
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	50
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	51 // first fill in the fields with explicit initializers
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	52 VarDeclarationIter field_it(base->fields);
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	53 for (; field_it.more(); field_it.next())
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	54 {
1270 dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	55 // init is !null for explicit inits
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	56 if (field_it->init != NULL)
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	57 {
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	58 IF_LOG Logger::println("adding explicit initializer for struct field %s",
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	59 field_it->toChars());
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	60
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	61 data[field_it.index] = *field_it;
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	62
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	63 size_t f_begin = field_it->offset;
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	64 size_t f_end = f_begin + field_it->type->size();
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	65
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	66 // make sure there is no overlap
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	67 for (size_t i = 0; i < field_it.index; i++)
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	68 {
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	69 if (data[i] != NULL)
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	70 {
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	71 VarDeclaration* vd = data[i];
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	72 size_t v_begin = vd->offset;
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	73 size_t v_end = v_begin + vd->type->size();
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	74
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	75 if (v_begin >= f_end \|\| v_end <= f_begin)
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	76 continue;
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	77
1270 dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	78 base->error(vd->loc, "has overlapping initialization for %s and %s",
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	79 field_it->toChars(), vd->toChars());
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	80 }
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	81 }
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	82 }
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	83 }
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	84
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	85 if (global.errors)
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	86 {
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	87 fatal();
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	88 }
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	89
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	90 // fill in default initializers
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	91 field_it = VarDeclarationIter(base->fields);
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	92 for (;field_it.more(); field_it.next())
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	93 {
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	94 if (data[field_it.index])
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	95 continue;
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	96
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	97 size_t f_begin = field_it->offset;
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	98 size_t f_end = f_begin + field_it->type->size();
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	99
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	100 // make sure it doesn't overlap anything explicit
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	101 bool overlaps = false;
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	102 for (size_t i = 0; i < n; i++)
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	103 {
1270 dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	104 if (data[i])
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	105 {
1270 dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	106 size_t v_begin = data[i]->offset;
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	107 size_t v_end = v_begin + data[i]->type->size();
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	108
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	109 if (v_begin >= f_end \|\| v_end <= f_begin)
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	110 continue;
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	111
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	112 overlaps = true;
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	113 break;
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	114 }
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	115 }
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	116
1270 dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	117 // if no overlap was found, add the default initializer
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	118 if (!overlaps)
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	119 {
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	120 IF_LOG Logger::println("adding default initializer for struct field %s",
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	121 field_it->toChars());
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	122 data[field_it.index] = *field_it;
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	123 }
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	124 }
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	125
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	126 // ok. now we can build a list of llvm types. and make sure zeros are inserted if necessary.
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	127
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	128 // first we sort the list by offset
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	129 std::sort(data.begin(), data.end(), var_offset_sort_cb);
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	130
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	131 // add types to list
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	132 for (size_t i = 0; i < n; i++)
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	133 {
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	134 VarDeclaration* vd = data[i];
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	135
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	136 if (vd == NULL)
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	137 continue;
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	138
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	139 assert(vd->offset >= offset && "it's a bug...");
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	140
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	141 // add to default field list
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	142 if (cd == base)
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	143 default_fields.push_back(vd);
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	144
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	145 // get next aligned offset for this type
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	146 size_t alignsize = vd->type->alignsize();
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	147 size_t alignedoffset = (offset + alignsize - 1) & ~(alignsize - 1);
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	148
1270 dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	149 // insert explicit padding?
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	150 if (alignedoffset < vd->offset)
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	151 {
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	152 field_index += add_zeros(defaultTypes, vd->offset - alignedoffset);
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	153 }
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	154
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	155 // add default type
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	156 defaultTypes.push_back(DtoType(vd->type));
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	157
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	158 // advance offset to right past this field
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	159 offset = vd->offset + vd->type->size();
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	160
1270 dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	161 // create ir field
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	162 vd->aggrIndex = (unsigned)field_index;
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	163 ++field_index;
1270 dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	164 }
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	165
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	166 // any interface implementations?
1270 dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	167 if (base->vtblInterfaces && base->vtblInterfaces->dim > 0)
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	168 {
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	169 bool new_instances = (base == cd);
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	170
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	171 ArrayIter<BaseClass> it2(*base->vtblInterfaces);
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	172
1230 e67c85d6e680 Completed interface implementation. Hopefully that's it for now.. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	173 VarDeclarationIter interfaces_idx(ClassDeclaration::classinfo->fields, 3);
e67c85d6e680 Completed interface implementation. Hopefully that's it for now.. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	174 Type* first = interfaces_idx->type->next->pointerTo();
e67c85d6e680 Completed interface implementation. Hopefully that's it for now.. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	175
1270 dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	176 // align offset
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	177 offset = (offset + PTRSIZE - 1) & ~(PTRSIZE - 1);
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	178
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	179 for (; !it2.done(); it2.next())
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	180 {
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	181 BaseClass* b = it2.get();
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	182 IF_LOG Logger::println("Adding interface vtbl for %s", b->base->toPrettyChars());
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	183
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	184 Array arr;
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	185 b->fillVtbl(cd, &arr, new_instances);
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	186
1230 e67c85d6e680 Completed interface implementation. Hopefully that's it for now.. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	187 const llvm::Type* ivtbl_type = buildVtblType(first, &arr);
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	188 defaultTypes.push_back(llvm::PointerType::get(ivtbl_type, 0));
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 offset += PTRSIZE;
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	191
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	192 // add to the interface map
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: 1231 diff changeset	193 addInterfaceToMap(b->base, field_index);
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	194 field_index++;
1230 e67c85d6e680 Completed interface implementation. Hopefully that's it for now.. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	195
e67c85d6e680 Completed interface implementation. Hopefully that's it for now.. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	196 // inc count
e67c85d6e680 Completed interface implementation. Hopefully that's it for now.. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1228 diff changeset	197 num_interface_vtbls++;
1228 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
1270 dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	201 #if 0
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	202 // tail padding?
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	203 if (offset < base->structsize)
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	204 {
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	205 field_index += add_zeros(defaultTypes, base->structsize - offset);
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	206 offset = base->structsize;
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	207 }
1270 dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	208 #endif
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	209 }
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	210
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	211 //////////////////////////////////////////////////////////////////////////////
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	212
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	213 const llvm::Type* IrTypeClass::buildType()
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	214 {
1278 8fb39f7f1a7c Fixed file name in imported mixins containing assertions. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1270 diff changeset	215 IF_LOG Logger::println("Building class type %s @ %s", cd->toPrettyChars(), cd->loc.toChars());
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	216 LOG_SCOPE;
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	217 IF_LOG Logger::println("Instance size: %u", cd->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 // find the fields that contribute to the default initializer.
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	220 // these will define the default type.
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	221
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	222 std::vector<const llvm::Type*> defaultTypes;
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	223 defaultTypes.reserve(32);
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	224
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	225 // add vtbl
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	226 defaultTypes.push_back(llvm::PointerType::get(vtbl_pa.get(), 0));
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	227
1253 752bed475b75 Fixed classinfo.interfaces for .. interfaces! Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	228 // interfaces are just a vtable
752bed475b75 Fixed classinfo.interfaces for .. interfaces! Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	229 if (cd->isInterfaceDeclaration())
752bed475b75 Fixed classinfo.interfaces for .. interfaces! Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	230 {
752bed475b75 Fixed classinfo.interfaces for .. interfaces! Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	231 num_interface_vtbls = cd->vtblInterfaces ? cd->vtblInterfaces->dim : 0;
752bed475b75 Fixed classinfo.interfaces for .. interfaces! Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	232 }
752bed475b75 Fixed classinfo.interfaces for .. interfaces! Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	233 // classes have monitor and fields
752bed475b75 Fixed classinfo.interfaces for .. interfaces! Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1245 diff changeset	234 else
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	235 {
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	236 // add monitor
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	237 defaultTypes.push_back(llvm::PointerType::get(llvm::Type::Int8Ty, 0));
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	238
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	239 // we start right after the vtbl and monitor
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	240 size_t offset = PTRSIZE * 2;
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	241 size_t field_index = 2;
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	242
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	243 // add data members recursively
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	244 addBaseClassData(defaultTypes, cd, offset, field_index);
1270 dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	245
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	246 #if 1
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	247 // tail padding?
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	248 if (offset < cd->structsize)
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	249 {
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	250 field_index += add_zeros(defaultTypes, cd->structsize - offset);
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	251 offset = cd->structsize;
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	252 }
dd135ff697fa Fixed class default initializers and type generation. Bug #260 is fixed. Tomas Lindquist Olsen <tomas.l.olsen gmail com> parents: 1265 diff changeset	253 #endif
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	254 }
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	255
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	256 // errors are fatal during codegen
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	257 if (global.errors)
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	258 fatal();
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	259
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	260 // build the llvm type
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	261 const llvm::Type* st = llvm::StructType::get(defaultTypes, false);
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	262
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	263 // refine type
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	264 llvm::cast<llvm::OpaqueType>(pa.get())->refineAbstractTypeTo(st);
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	265
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	266 // name type
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	267 Type::sir->getState()->module->addTypeName(cd->toPrettyChars(), pa.get());
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	268
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	269 // VTBL
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	270
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	271 // build vtbl type
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	272 const llvm::Type* vtblty = buildVtblType(
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	273 ClassDeclaration::classinfo->type,
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	274 &cd->vtbl);
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	275
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	276 // refine vtbl pa
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	277 llvm::cast<llvm::OpaqueType>(vtbl_pa.get())->refineAbstractTypeTo(vtblty);
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	278
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	279 // name vtbl type
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	280 std::string name(cd->toPrettyChars());
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	281 name.append(".__vtbl");
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	282 Type::sir->getState()->module->addTypeName(name, vtbl_pa.get());
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	283
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	284 #if 0
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	285 IF_LOG Logger::cout() << "class type: " << *pa.get() << std::endl;
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	286 #endif
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	287
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	288 return get();
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	289 }
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	290
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	291 //////////////////////////////////////////////////////////////////////////////
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	292
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	293 const llvm::Type* IrTypeClass::buildVtblType(Type* first, Array* vtbl_array)
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	294 {
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	295 IF_LOG Logger::println("Building vtbl type for class %s", cd->toPrettyChars());
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	296 LOG_SCOPE;
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	297
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	298 std::vector<const llvm::Type*> types;
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	299 types.reserve(vtbl_array->dim);
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	300
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	301 // first comes the classinfo
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	302 types.push_back(DtoType(first));
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	303
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	304 // then come the functions
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	305 ArrayIter<Dsymbol> it(*vtbl_array);
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	306 it.index = 1;
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	307
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	308 for (; !it.done(); it.next())
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	309 {
1231 212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1230 diff changeset	310 Dsymbol* dsym = it.get();
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1230 diff changeset	311 if (dsym == NULL)
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1230 diff changeset	312 {
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1230 diff changeset	313 // FIXME
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1230 diff changeset	314 // why is this null?
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1230 diff changeset	315 // happens for mini/s.d
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1230 diff changeset	316 types.push_back(getVoidPtrType());
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1230 diff changeset	317 continue;
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1230 diff changeset	318 }
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1230 diff changeset	319
212ec2d9d176 Fixed some minitest regressions. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: 1230 diff changeset	320 FuncDeclaration* fd = dsym->isFuncDeclaration();
1228 79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	321 assert(fd && "invalid vtbl entry");
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	322
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	323 IF_LOG Logger::println("Adding type of %s", fd->toPrettyChars());
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	324
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	325 types.push_back(DtoType(fd->type->pointerTo()));
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	326 }
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	327
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	328 // build the vtbl llvm type
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	329 return llvm::StructType::get(types, false);
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	330 }
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	331
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	332 //////////////////////////////////////////////////////////////////////////////
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	333
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	334 const llvm::Type * IrTypeClass::get()
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	335 {
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	336 return llvm::PointerType::get(pa.get(), 0);
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	337 }
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	338
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	339 //////////////////////////////////////////////////////////////////////////////
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	340
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	341 size_t IrTypeClass::getInterfaceIndex(ClassDeclaration * inter)
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	342 {
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	343 ClassIndexMap::iterator it = interfaceMap.find(inter);
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	344 if (it == interfaceMap.end())
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	345 return ~0;
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	346 return it->second;
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	347 }
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	348
79758fd2f48a Added Doxygen file. Tomas Lindquist Olsen <tomas.l.olsen gmail.com> parents: diff changeset	349 //////////////////////////////////////////////////////////////////////////////
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: 1231 diff changeset	350
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: 1231 diff changeset	351 void IrTypeClass::addInterfaceToMap(ClassDeclaration * inter, size_t index)
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: 1231 diff changeset	352 {
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: 1231 diff changeset	353 // don't duplicate work or overwrite indices
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: 1231 diff changeset	354 if (interfaceMap.find(inter) != interfaceMap.end())
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: 1231 diff changeset	355 return;
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: 1231 diff changeset	356
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: 1231 diff changeset	357 // add this interface
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: 1231 diff changeset	358 interfaceMap.insert(std::make_pair(inter, index));
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: 1231 diff changeset	359
1265 bbe6d2b87842 Fix interface indices. Closes #269 and #266. Christian Kamm <kamm incasoftware de> parents: 1253 diff changeset	360 // add the direct base interfaces recursively - they
bbe6d2b87842 Fix interface indices. Closes #269 and #266. Christian Kamm <kamm incasoftware de> parents: 1253 diff changeset	361 // are accessed through the same index
bbe6d2b87842 Fix interface indices. Closes #269 and #266. Christian Kamm <kamm incasoftware de> parents: 1253 diff changeset	362 if (inter->interfaces_dim > 0)
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: 1231 diff changeset	363 {
1265 bbe6d2b87842 Fix interface indices. Closes #269 and #266. Christian Kamm <kamm incasoftware de> parents: 1253 diff changeset	364 BaseClass* b = inter->interfaces[0];
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: 1231 diff changeset	365 addInterfaceToMap(b->base, index);
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: 1231 diff changeset	366 }
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: 1231 diff changeset	367 }
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: 1231 diff changeset	368
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: 1231 diff changeset	369 //////////////////////////////////////////////////////////////////////////////

Mercurial > projects > ldc

annotate ir/irtypeclass.cpp @ 1309:0c03ba6f7c24