projects/ldc: gen/classes.cpp annotate

annotate gen/classes.cpp @ 705:5a2983f97498

Fixed weird struct problem from downs, see mini/compile_structs1.d Rewrote DtoIndexStruct/Class , the old implementation were way too complex for what we really need now - since the DotVar changes.

author	Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
date	Tue, 14 Oct 2008 15:35:49 +0200
parents	92ec7487a1a0
children	635f91212b78

rev	line source
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1 #include <sstream>
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	2 #include "gen/llvm.h"
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	3
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	4 #include "mtype.h"
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	5 #include "aggregate.h"
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	6 #include "init.h"
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	7 #include "declaration.h"
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	8
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	9 #include "gen/irstate.h"
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	10 #include "gen/tollvm.h"
244 a95056b3c996 [svn r261] Fixed debug info for integer and floating local variables, can now be inspected in GDB. lindquist parents: 217 diff changeset	11 #include "gen/llvmhelpers.h"
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	12 #include "gen/arrays.h"
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	13 #include "gen/logger.h"
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	14 #include "gen/classes.h"
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	15 #include "gen/structs.h"
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	16 #include "gen/functions.h"
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	17 #include "gen/runtime.h"
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	18 #include "gen/dvalue.h"
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	19
136 0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	20 #include "ir/irstruct.h"
0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	21
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	22 //////////////////////////////////////////////////////////////////////////////////////////
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	23
137 ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	24 static void LLVM_AddBaseClassInterfaces(ClassDeclaration* target, BaseClasses* bcs)
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	25 {
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	26 // add base class data members first
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	27 for (int j=0; j<bcs->dim; j++)
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	28 {
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	29 BaseClass* bc = (BaseClass*)(bcs->data[j]);
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	30
142 a123dca8349b [svn r146] fixed some potential problems with mismatch in order of interfaces in class data layout lindquist parents: 138 diff changeset	31 // base classes might add more interfaces?
a123dca8349b [svn r146] fixed some potential problems with mismatch in order of interfaces in class data layout lindquist parents: 138 diff changeset	32 DtoResolveClass(bc->base);
a123dca8349b [svn r146] fixed some potential problems with mismatch in order of interfaces in class data layout lindquist parents: 138 diff changeset	33 LLVM_AddBaseClassInterfaces(target, &bc->base->baseclasses);
a123dca8349b [svn r146] fixed some potential problems with mismatch in order of interfaces in class data layout lindquist parents: 138 diff changeset	34
137 ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	35 // resolve interfaces while we're at it
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	36 if (bc->base->isInterfaceDeclaration())
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	37 {
142 a123dca8349b [svn r146] fixed some potential problems with mismatch in order of interfaces in class data layout lindquist parents: 138 diff changeset	38 // don't add twice
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	39 if (target->ir.irStruct->interfaceMap.find(bc->base) == target->ir.irStruct->interfaceMap.end())
142 a123dca8349b [svn r146] fixed some potential problems with mismatch in order of interfaces in class data layout lindquist parents: 138 diff changeset	40 {
a123dca8349b [svn r146] fixed some potential problems with mismatch in order of interfaces in class data layout lindquist parents: 138 diff changeset	41 Logger::println("adding interface '%s'", bc->base->toPrettyChars());
307 7ade5e035beb [svn r328] Fixed an issue with interfaces where the vtable type of a interface implemented could be invalid. Fixes several tango modules like, FileStream, ServerSocket lindquist parents: 295 diff changeset	42 IrInterface* iri = new IrInterface(bc);
142 a123dca8349b [svn r146] fixed some potential problems with mismatch in order of interfaces in class data layout lindquist parents: 138 diff changeset	43
a123dca8349b [svn r146] fixed some potential problems with mismatch in order of interfaces in class data layout lindquist parents: 138 diff changeset	44 // add to map
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	45 target->ir.irStruct->interfaceMap.insert(std::make_pair(bc->base, iri));
142 a123dca8349b [svn r146] fixed some potential problems with mismatch in order of interfaces in class data layout lindquist parents: 138 diff changeset	46 // add to ordered list
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	47 target->ir.irStruct->interfaceVec.push_back(iri);
142 a123dca8349b [svn r146] fixed some potential problems with mismatch in order of interfaces in class data layout lindquist parents: 138 diff changeset	48
137 ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	49 // Fill in vtbl[]
142 a123dca8349b [svn r146] fixed some potential problems with mismatch in order of interfaces in class data layout lindquist parents: 138 diff changeset	50 if (!target->isAbstract()) {
a123dca8349b [svn r146] fixed some potential problems with mismatch in order of interfaces in class data layout lindquist parents: 138 diff changeset	51 bc->fillVtbl(target, &bc->vtbl, 0);
a123dca8349b [svn r146] fixed some potential problems with mismatch in order of interfaces in class data layout lindquist parents: 138 diff changeset	52 }
137 ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	53 }
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	54 }
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	55 }
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	56 }
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	57
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	58 //////////////////////////////////////////////////////////////////////////////////////////
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	59
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	60 static void LLVM_AddBaseClassData(BaseClasses* bcs)
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	61 {
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	62 // add base class data members first
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	63 for (int j=0; j<bcs->dim; j++)
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	64 {
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	65 BaseClass* bc = (BaseClass*)(bcs->data[j]);
137 ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	66
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	67 // interfaces never add data fields
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	68 if (bc->base->isInterfaceDeclaration())
137 ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	69 continue;
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	70
137 ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	71 // recursively add baseclass data
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	72 LLVM_AddBaseClassData(&bc->base->baseclasses);
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	73
137 ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	74 Array* arr = &bc->base->fields;
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	75 if (arr->dim == 0)
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	76 continue;
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	77
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	78 Logger::println("Adding base class members of %s", bc->base->toChars());
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	79 LOG_SCOPE;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	80
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	81 for (int k=0; k < arr->dim; k++) {
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	82 VarDeclaration* v = (VarDeclaration*)(arr->data[k]);
336 aaade6ded589 [svn r357] Merged DMD 1.033 lindquist parents: 328 diff changeset	83 v->toObjFile(0); // TODO: multiobj
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	84 }
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	85 }
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	86 }
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	87
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	88 //////////////////////////////////////////////////////////////////////////////////////////
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	89
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	90 void DtoResolveClass(ClassDeclaration* cd)
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	91 {
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	92 if (cd->ir.resolved) return;
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	93 cd->ir.resolved = true;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	94
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	95 Logger::println("DtoResolveClass(%s): %s", cd->toPrettyChars(), cd->loc.toChars());
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	96 LOG_SCOPE;
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	97
622 26fce59fe80a Wrapped all the most potentially expensive logging calls in a conditional to only do work when actually requested. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 618 diff changeset	98 //printf("resolve class: %s\n", cd->toPrettyChars());
26fce59fe80a Wrapped all the most potentially expensive logging calls in a conditional to only do work when actually requested. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 618 diff changeset	99
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	100 // get the TypeClass
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	101 assert(cd->type->ty == Tclass);
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	102 TypeClass* ts = (TypeClass*)cd->type;
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	103
136 0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	104 // make sure the IrStruct is created
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	105 IrStruct* irstruct = cd->ir.irStruct;
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	106 if (!irstruct) {
136 0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	107 irstruct = new IrStruct(ts);
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	108 cd->ir.irStruct = irstruct;
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	109 }
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	110
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	111 // resolve the base class
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	112 if (cd->baseClass) {
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	113 DtoResolveClass(cd->baseClass);
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	114 }
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	115
136 0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	116 // resolve interface vtables
137 ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	117 /*if (cd->vtblInterfaces) {
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	118 Logger::println("Vtbl interfaces for '%s'", cd->toPrettyChars());
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	119 LOG_SCOPE;
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	120 for (int i=0; i < cd->vtblInterfaces->dim; i++) {
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	121 BaseClass b = (BaseClass )cd->vtblInterfaces->data[i];
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	122 ClassDeclaration *id = b->base;
137 ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	123 Logger::println("Vtbl interface: '%s'", id->toPrettyChars());
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	124 DtoResolveClass(id);
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	125 // Fill in vtbl[]
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	126 b->fillVtbl(cd, &b->vtbl, 1);
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	127 }
137 ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	128 }*/
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	129
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	130 // push state
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	131 gIR->structs.push_back(irstruct);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	132 gIR->classes.push_back(cd);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	133
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	134 // vector holding the field types
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	135 std::vector<const LLType*> fieldtypes;
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	136
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	137 // add vtable
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	138 ts->ir.vtblType = new llvm::PATypeHolder(llvm::OpaqueType::get());
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	139 const LLType* vtabty = getPtrToType(ts->ir.vtblType->get());
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	140 fieldtypes.push_back(vtabty);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	141
115 5ba6d286c941 [svn r119] Added the monitor data field that comes after the vtable pointer to all classes. Represented as a void* initialized to zero. lindquist parents: 114 diff changeset	142 // add monitor
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	143 fieldtypes.push_back(getVoidPtrType());
115 5ba6d286c941 [svn r119] Added the monitor data field that comes after the vtable pointer to all classes. Represented as a void* initialized to zero. lindquist parents: 114 diff changeset	144
137 ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	145 // add base class data fields first
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	146 LLVM_AddBaseClassData(&cd->baseclasses);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	147
199 ba47ac346ddd [svn r215] fix for empty class vtbl ChristianK parents: 193 diff changeset	148 // then add own members, if any
ba47ac346ddd [svn r215] fix for empty class vtbl ChristianK parents: 193 diff changeset	149 if(cd->members) {
ba47ac346ddd [svn r215] fix for empty class vtbl ChristianK parents: 193 diff changeset	150 for (int k=0; k < cd->members->dim; k++) {
ba47ac346ddd [svn r215] fix for empty class vtbl ChristianK parents: 193 diff changeset	151 Dsymbol* dsym = (Dsymbol*)(cd->members->data[k]);
336 aaade6ded589 [svn r357] Merged DMD 1.033 lindquist parents: 328 diff changeset	152 dsym->toObjFile(0); // TODO: multiobj
199 ba47ac346ddd [svn r215] fix for empty class vtbl ChristianK parents: 193 diff changeset	153 }
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	154 }
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	155
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	156 // resolve class data fields (possibly unions)
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	157 Logger::println("doing class fields");
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	158
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	159 if (irstruct->offsets.empty())
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	160 {
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	161 Logger::println("has no fields");
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	162 }
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	163 else
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	164 {
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	165 Logger::println("has fields");
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	166 unsigned prevsize = (unsigned)-1;
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	167 unsigned lastoffset = (unsigned)-1;
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	168 const LLType* fieldtype = NULL;
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	169 VarDeclaration* fieldinit = NULL;
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	170 size_t fieldpad = 0;
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	171 int idx = 0;
136 0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	172 for (IrStruct::OffsetMap::iterator i=irstruct->offsets.begin(); i!=irstruct->offsets.end(); ++i) {
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	173 // first iteration
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	174 if (lastoffset == (unsigned)-1) {
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	175 lastoffset = i->first;
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	176 fieldtype = i->second.type;
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	177 fieldinit = i->second.var;
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	178 prevsize = getABITypeSize(fieldtype);
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	179 i->second.var->ir.irField->index = idx;
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	180 }
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	181 // colliding offset?
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	182 else if (lastoffset == i->first) {
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	183 size_t s = getABITypeSize(i->second.type);
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	184 if (s > prevsize) {
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	185 fieldpad += s - prevsize;
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	186 prevsize = s;
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	187 }
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	188 cd->ir.irStruct->hasUnions = true;
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	189 i->second.var->ir.irField->index = idx;
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	190 }
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	191 // intersecting offset?
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	192 else if (i->first < (lastoffset + prevsize)) {
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	193 size_t s = getABITypeSize(i->second.type);
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	194 assert((i->first + s) <= (lastoffset + prevsize)); // this holds because all types are aligned to their size
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	195 cd->ir.irStruct->hasUnions = true;
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	196 i->second.var->ir.irField->index = idx;
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	197 i->second.var->ir.irField->indexOffset = (i->first - lastoffset) / s;
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	198 }
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	199 // fresh offset
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	200 else {
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	201 // commit the field
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	202 fieldtypes.push_back(fieldtype);
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	203 irstruct->defaultFields.push_back(fieldinit);
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	204 if (fieldpad) {
244 a95056b3c996 [svn r261] Fixed debug info for integer and floating local variables, can now be inspected in GDB. lindquist parents: 217 diff changeset	205 fieldtypes.push_back(llvm::ArrayType::get(LLType::Int8Ty, fieldpad));
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	206 irstruct->defaultFields.push_back(NULL);
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	207 idx++;
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	208 }
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	209
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	210 idx++;
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	211
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	212 // start new
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	213 lastoffset = i->first;
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	214 fieldtype = i->second.type;
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	215 fieldinit = i->second.var;
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	216 prevsize = getABITypeSize(fieldtype);
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	217 i->second.var->ir.irField->index = idx;
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	218 fieldpad = 0;
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	219 }
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	220 }
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	221 fieldtypes.push_back(fieldtype);
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	222 irstruct->defaultFields.push_back(fieldinit);
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	223 if (fieldpad) {
244 a95056b3c996 [svn r261] Fixed debug info for integer and floating local variables, can now be inspected in GDB. lindquist parents: 217 diff changeset	224 fieldtypes.push_back(llvm::ArrayType::get(LLType::Int8Ty, fieldpad));
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	225 irstruct->defaultFields.push_back(NULL);
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	226 }
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	227 }
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	228
137 ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	229 // populate interface map
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	230 {
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	231 Logger::println("Adding interfaces to '%s'", cd->toPrettyChars());
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	232 LOG_SCOPE;
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	233 LLVM_AddBaseClassInterfaces(cd, &cd->baseclasses);
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	234 Logger::println("%d interfaces added", cd->ir.irStruct->interfaceVec.size());
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	235 assert(cd->ir.irStruct->interfaceVec.size() == cd->ir.irStruct->interfaceMap.size());
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	236 }
137 ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	237
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	238 // add interface vtables at the end
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	239 int interIdx = (int)fieldtypes.size();
142 a123dca8349b [svn r146] fixed some potential problems with mismatch in order of interfaces in class data layout lindquist parents: 138 diff changeset	240 for (IrStruct::InterfaceVectorIter i=irstruct->interfaceVec.begin(); i!=irstruct->interfaceVec.end(); ++i)
137 ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	241 {
142 a123dca8349b [svn r146] fixed some potential problems with mismatch in order of interfaces in class data layout lindquist parents: 138 diff changeset	242 IrInterface* iri = *i;
a123dca8349b [svn r146] fixed some potential problems with mismatch in order of interfaces in class data layout lindquist parents: 138 diff changeset	243 ClassDeclaration* id = iri->decl;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	244
137 ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	245 // set vtbl type
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	246 TypeClass* itc = (TypeClass*)id->type;
307 7ade5e035beb [svn r328] Fixed an issue with interfaces where the vtable type of a interface implemented could be invalid. Fixes several tango modules like, FileStream, ServerSocket lindquist parents: 295 diff changeset	247 const LLType* ivtblTy = itc->ir.vtblType->get();
7ade5e035beb [svn r328] Fixed an issue with interfaces where the vtable type of a interface implemented could be invalid. Fixes several tango modules like, FileStream, ServerSocket lindquist parents: 295 diff changeset	248 assert(ivtblTy);
622 26fce59fe80a Wrapped all the most potentially expensive logging calls in a conditional to only do work when actually requested. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 618 diff changeset	249 if (Logger::enabled())
26fce59fe80a Wrapped all the most potentially expensive logging calls in a conditional to only do work when actually requested. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 618 diff changeset	250 Logger::cout() << "interface vtbl type: " << *ivtblTy << '\n';
307 7ade5e035beb [svn r328] Fixed an issue with interfaces where the vtable type of a interface implemented could be invalid. Fixes several tango modules like, FileStream, ServerSocket lindquist parents: 295 diff changeset	251 fieldtypes.push_back(getPtrToType(ivtblTy));
137 ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	252
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	253 // fix the interface vtable type
307 7ade5e035beb [svn r328] Fixed an issue with interfaces where the vtable type of a interface implemented could be invalid. Fixes several tango modules like, FileStream, ServerSocket lindquist parents: 295 diff changeset	254 assert(iri->vtblTy == NULL);
7ade5e035beb [svn r328] Fixed an issue with interfaces where the vtable type of a interface implemented could be invalid. Fixes several tango modules like, FileStream, ServerSocket lindquist parents: 295 diff changeset	255 iri->vtblTy = new llvm::PATypeHolder(ivtblTy);
137 ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	256
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	257 // set index
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	258 iri->index = interIdx++;
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	259 }
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	260 Logger::println("%d interface vtables added", cd->ir.irStruct->interfaceVec.size());
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	261 assert(cd->ir.irStruct->interfaceVec.size() == cd->ir.irStruct->interfaceMap.size());
137 ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	262
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	263 // create type
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	264 const llvm::StructType* structtype = llvm::StructType::get(fieldtypes);
137 ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	265
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	266 // refine abstract types for stuff like: class C {C next;}
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	267 assert(irstruct->recty != 0);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	268 llvm::PATypeHolder& spa = irstruct->recty;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	269 llvm::cast<llvm::OpaqueType>(spa.get())->refineAbstractTypeTo(structtype);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	270 structtype = isaStruct(spa.get());
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	271
137 ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	272 // make it official
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	273 if (!ts->ir.type)
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	274 ts->ir.type = new llvm::PATypeHolder(structtype);
103 855adfdb8d38 [svn r107] Getting .classinfo on a class instance now works (classinfo is stored in vtable) lindquist parents: 102 diff changeset	275 else
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	276 *ts->ir.type = structtype;
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	277 spa = *ts->ir.type;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	278
123 7f9a0a58394b [svn r127] Updated the lphobos build scripts a little. Created a new rebuild profile. lindquist parents: 121 diff changeset	279 // name the type
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	280 gIR->module->addTypeName(cd->mangle(), ts->ir.type->get());
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	281
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	282 // create vtable type
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	283 llvm::GlobalVariable* svtblVar = 0;
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	284 #if OPAQUE_VTBLS
aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	285 // void*[vtbl.dim]
aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	286 const llvm::ArrayType* svtbl_ty
aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	287 = llvm::ArrayType::get(getVoidPtrType(), cd->vtbl.dim);
aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	288
aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	289 #else
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	290 std::vector<const LLType*> sinits_ty;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	291
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	292 for (int k=0; k < cd->vtbl.dim; k++)
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	293 {
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	294 Dsymbol* dsym = (Dsymbol*)cd->vtbl.data[k];
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	295 assert(dsym);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	296 //Logger::cout() << "vtblsym: " << dsym->toChars() << '\n';
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	297
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	298 if (FuncDeclaration* fd = dsym->isFuncDeclaration()) {
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	299 DtoResolveFunction(fd);
117 56a21f3e5d3e [svn r121] Finished ModuleInfo implementation. lindquist parents: 115 diff changeset	300 //assert(fd->type->ty == Tfunction);
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation. lindquist parents: 115 diff changeset	301 //TypeFunction* tf = (TypeFunction*)fd->type;
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	302 //const LLType* fpty = getPtrToType(tf->ir.type->get());
117 56a21f3e5d3e [svn r121] Finished ModuleInfo implementation. lindquist parents: 115 diff changeset	303 const llvm::FunctionType* vfty = DtoBaseFunctionType(fd);
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	304 const LLType* vfpty = getPtrToType(vfty);
117 56a21f3e5d3e [svn r121] Finished ModuleInfo implementation. lindquist parents: 115 diff changeset	305 sinits_ty.push_back(vfpty);
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	306 }
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	307 else if (ClassDeclaration* cd2 = dsym->isClassDeclaration()) {
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	308 Logger::println("*** ClassDeclaration in vtable: %s", cd2->toChars());
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	309 const LLType* cinfoty;
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	310 if (cd->isInterfaceDeclaration()) {
669 92ec7487a1a0 Fix odd interfaceInfoType bug. Christian Kamm <kamm incasoftware de> parents: 657 diff changeset	311 cinfoty = DtoInterfaceInfoType();
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	312 }
137 ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	313 else if (cd != ClassDeclaration::classinfo) {
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	314 cinfoty = ClassDeclaration::classinfo->type->ir.type->get();
103 855adfdb8d38 [svn r107] Getting .classinfo on a class instance now works (classinfo is stored in vtable) lindquist parents: 102 diff changeset	315 }
855adfdb8d38 [svn r107] Getting .classinfo on a class instance now works (classinfo is stored in vtable) lindquist parents: 102 diff changeset	316 else {
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	317 // this is the ClassInfo class, the type is this type
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	318 cinfoty = ts->ir.type->get();
103 855adfdb8d38 [svn r107] Getting .classinfo on a class instance now works (classinfo is stored in vtable) lindquist parents: 102 diff changeset	319 }
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	320 const LLType* cty = getPtrToType(cinfoty);
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	321 sinits_ty.push_back(cty);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	322 }
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	323 else
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	324 assert(0);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	325 }
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	326
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	327 // get type
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	328 assert(!sinits_ty.empty());
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	329 const llvm::StructType* svtbl_ty = llvm::StructType::get(sinits_ty);
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	330 #endif
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	331
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	332 // refine for final vtable type
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	333 llvm::cast<llvm::OpaqueType>(ts->ir.vtblType->get())->refineAbstractTypeTo(svtbl_ty);
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	334
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	335 #if !OPAQUE_VTBLS
aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	336 // name vtbl type
aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	337 std::string styname(cd->mangle());
aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	338 styname.append("__vtblType");
aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	339 gIR->module->addTypeName(styname, svtbl_ty);
aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	340 #endif
aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	341
aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	342 // log
618 c9aa338280ed Removed some excessive llvm type logging tomas@myhost parents: 589 diff changeset	343 //Logger::cout() << "final class type: " << *ts->ir.type->get() << '\n';
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	344
aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	345 // pop state
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	346 gIR->classes.pop_back();
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	347 gIR->structs.pop_back();
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	348
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	349 // queue declare
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	350 gIR->declareList.push_back(cd);
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	351 }
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	352
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	353 //////////////////////////////////////////////////////////////////////////////////////////
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	354
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	355 void DtoDeclareClass(ClassDeclaration* cd)
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	356 {
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	357 if (cd->ir.declared) return;
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	358 cd->ir.declared = true;
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	359
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	360 Logger::println("DtoDeclareClass(%s): %s", cd->toPrettyChars(), cd->loc.toChars());
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	361 LOG_SCOPE;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	362
622 26fce59fe80a Wrapped all the most potentially expensive logging calls in a conditional to only do work when actually requested. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 618 diff changeset	363 //printf("declare class: %s\n", cd->toPrettyChars());
26fce59fe80a Wrapped all the most potentially expensive logging calls in a conditional to only do work when actually requested. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 618 diff changeset	364
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	365 assert(cd->type->ty == Tclass);
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	366 TypeClass* ts = (TypeClass*)cd->type;
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	367
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	368 assert(cd->ir.irStruct);
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	369 IrStruct* irstruct = cd->ir.irStruct;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	370
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	371 gIR->structs.push_back(irstruct);
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	372 gIR->classes.push_back(cd);
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	373
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	374 bool needs_definition = false;
147 0636f6269dfd [svn r152] Relates to ticket #34. Always emit class definition if it is a template instance. Linkage still needs to be fixed. ChristianK parents: 142 diff changeset	375 if (cd->getModule() == gIR->dmodule \|\| DtoIsTemplateInstance(cd)) {
123 7f9a0a58394b [svn r127] Updated the lphobos build scripts a little. Created a new rebuild profile. lindquist parents: 121 diff changeset	376 needs_definition = true;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	377 }
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	378
149 4c577c2b7229 [svn r155] Fixed a bunch of linkage problems (especially with templates) lindquist parents: 147 diff changeset	379 llvm::GlobalValue::LinkageTypes _linkage = DtoLinkage(cd);
136 0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	380
0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	381 // interfaces have no static initializer
0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	382 // same goes for abstract classes
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	383 if (!cd->isInterfaceDeclaration() && !cd->isAbstract()) {
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	384 // vtable
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	385 std::string varname("_D");
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	386 varname.append(cd->mangle());
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	387 varname.append("6__vtblZ");
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	388 cd->ir.irStruct->vtbl = new llvm::GlobalVariable(ts->ir.vtblType->get(), true, _linkage, 0, varname, gIR->module);
136 0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	389 }
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	390
136 0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	391 // get interface info type
0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	392 const llvm::StructType* infoTy = DtoInterfaceInfoType();
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	393
136 0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	394 // interface info array
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	395 if (!cd->ir.irStruct->interfaceVec.empty()) {
136 0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	396 // symbol name
0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	397 std::string nam = "_D";
0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	398 nam.append(cd->mangle());
0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	399 nam.append("16__interfaceInfosZ");
0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	400 // resolve array type
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	401 const llvm::ArrayType* arrTy = llvm::ArrayType::get(infoTy, cd->ir.irStruct->interfaceVec.size());
136 0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	402 // declare global
0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	403 irstruct->interfaceInfosTy = arrTy;
0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	404 irstruct->interfaceInfos = new llvm::GlobalVariable(arrTy, true, _linkage, NULL, nam, gIR->module);
0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	405 }
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	406
136 0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	407 // interfaces have no static initializer
0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	408 // same goes for abstract classes
0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	409 if (!cd->isInterfaceDeclaration() && !cd->isAbstract()) {
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	410 // interface vtables
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	411 unsigned idx = 0;
142 a123dca8349b [svn r146] fixed some potential problems with mismatch in order of interfaces in class data layout lindquist parents: 138 diff changeset	412 for (IrStruct::InterfaceVectorIter i=irstruct->interfaceVec.begin(); i!=irstruct->interfaceVec.end(); ++i)
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	413 {
142 a123dca8349b [svn r146] fixed some potential problems with mismatch in order of interfaces in class data layout lindquist parents: 138 diff changeset	414 IrInterface* iri = *i;
a123dca8349b [svn r146] fixed some potential problems with mismatch in order of interfaces in class data layout lindquist parents: 138 diff changeset	415 ClassDeclaration* id = iri->decl;
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	416
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	417 std::string nam("_D");
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	418 nam.append(cd->mangle());
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	419 nam.append("11__interface");
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	420 nam.append(id->mangle());
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	421 nam.append("6__vtblZ");
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	422
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	423 assert(iri->vtblTy);
307 7ade5e035beb [svn r328] Fixed an issue with interfaces where the vtable type of a interface implemented could be invalid. Fixes several tango modules like, FileStream, ServerSocket lindquist parents: 295 diff changeset	424 iri->vtbl = new llvm::GlobalVariable(iri->vtblTy->get(), true, _linkage, 0, nam, gIR->module);
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	425 LLConstant* idxs[2] = {DtoConstUint(0), DtoConstUint(idx)};
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	426 iri->info = llvm::ConstantExpr::getGetElementPtr(irstruct->interfaceInfos, idxs, 2);
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	427 idx++;
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	428 }
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	429
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	430 // init
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	431 std::string initname("_D");
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	432 initname.append(cd->mangle());
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	433 initname.append("6__initZ");
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	434
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	435 llvm::GlobalVariable* initvar = new llvm::GlobalVariable(ts->ir.type->get(), true, _linkage, NULL, initname, gIR->module);
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	436 cd->ir.irStruct->init = initvar;
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	437 }
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	438
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	439 gIR->classes.pop_back();
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	440 gIR->structs.pop_back();
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	441
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	442 gIR->constInitList.push_back(cd);
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	443 if (needs_definition)
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	444 gIR->defineList.push_back(cd);
103 855adfdb8d38 [svn r107] Getting .classinfo on a class instance now works (classinfo is stored in vtable) lindquist parents: 102 diff changeset	445
855adfdb8d38 [svn r107] Getting .classinfo on a class instance now works (classinfo is stored in vtable) lindquist parents: 102 diff changeset	446 // classinfo
855adfdb8d38 [svn r107] Getting .classinfo on a class instance now works (classinfo is stored in vtable) lindquist parents: 102 diff changeset	447 DtoDeclareClassInfo(cd);
106 5b5194b25f33 [svn r110] Fixed typeinfo for classes. lindquist parents: 103 diff changeset	448
5b5194b25f33 [svn r110] Fixed typeinfo for classes. lindquist parents: 103 diff changeset	449 // typeinfo
123 7f9a0a58394b [svn r127] Updated the lphobos build scripts a little. Created a new rebuild profile. lindquist parents: 121 diff changeset	450 if (needs_definition)
275 665b81613475 [svn r296] Removed: the 'suite' dir, it never took off! lindquist parents: 271 diff changeset	451 DtoTypeInfoOf(cd->type, false);
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	452 }
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	453
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	454 //////////////////////////////////////////////////////////////////////////////////////////
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	455
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	456 void DtoConstInitClass(ClassDeclaration* cd)
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	457 {
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	458 if (cd->ir.initialized) return;
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	459 cd->ir.initialized = true;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	460
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	461 Logger::println("DtoConstInitClass(%s): %s", cd->toPrettyChars(), cd->loc.toChars());
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	462 LOG_SCOPE;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	463
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	464 IrStruct* irstruct = cd->ir.irStruct;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	465 gIR->structs.push_back(irstruct);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	466 gIR->classes.push_back(cd);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	467
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	468 // get the struct (class) type
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	469 assert(cd->type->ty == Tclass);
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	470 TypeClass* ts = (TypeClass*)cd->type;
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	471 const llvm::StructType* structtype = isaStruct(ts->ir.type->get());
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	472 #if OPAQUE_VTBLS
aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	473 const llvm::ArrayType* vtbltype = isaArray(ts->ir.vtblType->get());
aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	474 #else
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	475 const llvm::StructType* vtbltype = isaStruct(ts->ir.vtblType->get());
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	476 #endif
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	477
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	478 // make sure each offset knows its default initializer
136 0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	479 for (IrStruct::OffsetMap::iterator i=irstruct->offsets.begin(); i!=irstruct->offsets.end(); ++i)
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	480 {
136 0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	481 IrStruct::Offset* so = &i->second;
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	482 LLConstant* finit = DtoConstFieldInitializer(so->var->type, so->var->init);
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	483 so->init = finit;
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	484 so->var->ir.irField->constInit = finit;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	485 }
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	486
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	487 // fill out fieldtypes/inits
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	488 std::vector<LLConstant*> fieldinits;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	489
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	490 // first field is always the vtable
190 36044016709a [svn r206] Fixed some interfaceInfo related issues, closes #44 lindquist parents: 177 diff changeset	491 if (cd->isAbstract() \|\| cd->isInterfaceDeclaration())
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	492 {
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	493 const LLType* ptrTy = getPtrToType(ts->ir.vtblType->get());
190 36044016709a [svn r206] Fixed some interfaceInfo related issues, closes #44 lindquist parents: 177 diff changeset	494 fieldinits.push_back(llvm::Constant::getNullValue(ptrTy));
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	495 }
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	496 else
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	497 {
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	498 assert(cd->ir.irStruct->vtbl != 0);
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	499 fieldinits.push_back(cd->ir.irStruct->vtbl);
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	500 }
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	501
115 5ba6d286c941 [svn r119] Added the monitor data field that comes after the vtable pointer to all classes. Represented as a void* initialized to zero. lindquist parents: 114 diff changeset	502 // then comes monitor
244 a95056b3c996 [svn r261] Fixed debug info for integer and floating local variables, can now be inspected in GDB. lindquist parents: 217 diff changeset	503 fieldinits.push_back(llvm::ConstantPointerNull::get(getPtrToType(LLType::Int8Ty)));
115 5ba6d286c941 [svn r119] Added the monitor data field that comes after the vtable pointer to all classes. Represented as a void* initialized to zero. lindquist parents: 114 diff changeset	504
137 ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	505 // go through the field inits and build the default initializer
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	506 size_t nfi = irstruct->defaultFields.size();
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	507 for (size_t i=0; i<nfi; ++i) {
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	508 LLConstant* c;
137 ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	509 if (irstruct->defaultFields[i]) {
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	510 c = irstruct->defaultFields[i]->ir.irField->constInit;
137 ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	511 assert(c);
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	512 }
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	513 else {
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	514 const llvm::ArrayType* arrty = isaArray(structtype->getElementType(i+2));
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	515 assert(arrty);
244 a95056b3c996 [svn r261] Fixed debug info for integer and floating local variables, can now be inspected in GDB. lindquist parents: 217 diff changeset	516 std::vector<LLConstant*> vals(arrty->getNumElements(), llvm::ConstantInt::get(LLType::Int8Ty, 0, false));
137 ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	517 c = llvm::ConstantArray::get(arrty, vals);
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	518 }
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	519 fieldinits.push_back(c);
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	520 }
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	521
137 ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	522 // last comes interface vtables
136 0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	523 const llvm::StructType* infoTy = DtoInterfaceInfoType();
142 a123dca8349b [svn r146] fixed some potential problems with mismatch in order of interfaces in class data layout lindquist parents: 138 diff changeset	524 for (IrStruct::InterfaceVectorIter i=irstruct->interfaceVec.begin(); i!=irstruct->interfaceVec.end(); ++i)
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	525 {
142 a123dca8349b [svn r146] fixed some potential problems with mismatch in order of interfaces in class data layout lindquist parents: 138 diff changeset	526 IrInterface* iri = *i;
136 0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	527 iri->infoTy = infoTy;
142 a123dca8349b [svn r146] fixed some potential problems with mismatch in order of interfaces in class data layout lindquist parents: 138 diff changeset	528
192 67ed21bf16af [svn r208] const init interface vtbls to nonzero values only for nonabstract classes ChristianK parents: 190 diff changeset	529 if (cd->isAbstract() \|\| cd->isInterfaceDeclaration())
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	530 {
137 ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	531 fieldinits.push_back(llvm::Constant::getNullValue(structtype->getElementType(iri->index)));
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	532 }
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	533 else
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	534 {
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	535 assert(iri->vtbl);
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	536 fieldinits.push_back(iri->vtbl);
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	537 }
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	538 }
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	539
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	540 // generate initializer
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	541 #if 0
137 ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	542 //Logger::cout() << cd->toPrettyChars() << " \| " << *structtype << '\n';
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	543 assert(fieldinits.size() == structtype->getNumElements());
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	544 for(size_t i=0; i<structtype->getNumElements(); ++i) {
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	545 Logger::cout() << "s#" << i << " = " << *structtype->getElementType(i) << '\n';
137 ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	546 Logger::cout() << "i#" << i << " = " << *fieldinits[i] << '\n';
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	547 assert(fieldinits[i]->getType() == structtype->getElementType(i));
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	548 }
137 ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	549 #endif
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	550
137 ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	551 #if 0
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	552 for(size_t i=0; i<fieldinits.size(); ++i) {
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	553 Logger::cout() << "i#" << i << " = " << *fieldinits[i]->getType() << '\n';
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	554 }
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	555 #endif
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	556
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	557 LLConstant* _init = llvm::ConstantStruct::get(structtype, fieldinits);
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	558 assert(_init);
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	559 cd->ir.irStruct->constInit = _init;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	560
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	561 // abstract classes have no static vtable
137 ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	562 // neither do interfaces (on their own, the implementing class supplies the vtable)
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	563 if (!cd->isInterfaceDeclaration() && !cd->isAbstract())
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	564 {
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	565 // generate vtable initializer
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	566 std::vector<LLConstant*> sinits;
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	567
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	568 for (int k=0; k < cd->vtbl.dim; k++)
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	569 {
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	570 Dsymbol* dsym = (Dsymbol*)cd->vtbl.data[k];
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	571 assert(dsym);
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	572 //Logger::cout() << "vtblsym: " << dsym->toChars() << '\n';
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	573
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	574 #if OPAQUE_VTBLS
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	575 const LLType* targetTy = getVoidPtrType();
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	576 #else
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	577 const LLType* targetTy = vtbltype->getElementType(k);
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	578 #endif
aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	579
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	580 LLConstant* c = NULL;
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	581 // virtual method
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	582 if (FuncDeclaration* fd = dsym->isFuncDeclaration()) {
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	583 DtoForceDeclareDsymbol(fd);
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	584 assert(fd->ir.irFunc->func);
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	585 c = llvm::cast<llvm::Constant>(fd->ir.irFunc->func);
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	586 }
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	587 // classinfo
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	588 else if (ClassDeclaration* cd2 = dsym->isClassDeclaration()) {
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	589 assert(cd->ir.irStruct->classInfo);
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	590 c = cd->ir.irStruct->classInfo;
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	591 }
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	592 assert(c != NULL);
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	593
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	594 // cast if necessary (overridden method)
aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	595 if (c->getType() != targetTy)
aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	596 c = llvm::ConstantExpr::getBitCast(c, targetTy);
aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	597 sinits.push_back(c);
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	598 }
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	599 #if OPAQUE_VTBLS
aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	600 const llvm::ArrayType* svtbl_ty = isaArray(ts->ir.vtblType->get());
199 ba47ac346ddd [svn r215] fix for empty class vtbl ChristianK parents: 193 diff changeset	601 cd->ir.irStruct->constVtbl = llvm::ConstantArray::get(svtbl_ty, sinits);
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	602 #else
aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	603 const llvm::StructType* svtbl_ty = isaStruct(ts->ir.vtblType->get());
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	604 LLConstant* cvtblInit = llvm::ConstantStruct::get(svtbl_ty, sinits);
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	605 cd->ir.irStruct->constVtbl = llvm::cast<llvm::ConstantStruct>(cvtblInit);
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	606 #endif
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	607
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	608 // create interface vtable const initalizers
142 a123dca8349b [svn r146] fixed some potential problems with mismatch in order of interfaces in class data layout lindquist parents: 138 diff changeset	609 for (IrStruct::InterfaceVectorIter i=irstruct->interfaceVec.begin(); i!=irstruct->interfaceVec.end(); ++i)
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	610 {
142 a123dca8349b [svn r146] fixed some potential problems with mismatch in order of interfaces in class data layout lindquist parents: 138 diff changeset	611 IrInterface* iri = *i;
a123dca8349b [svn r146] fixed some potential problems with mismatch in order of interfaces in class data layout lindquist parents: 138 diff changeset	612 BaseClass* b = iri->base;
a123dca8349b [svn r146] fixed some potential problems with mismatch in order of interfaces in class data layout lindquist parents: 138 diff changeset	613
a123dca8349b [svn r146] fixed some potential problems with mismatch in order of interfaces in class data layout lindquist parents: 138 diff changeset	614 ClassDeclaration* id = iri->decl;
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	615 assert(id->type->ty == Tclass);
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	616 TypeClass* its = (TypeClass*)id->type;
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	617
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	618 #if OPAQUE_VTBLS
aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	619 const llvm::ArrayType* ivtbl_ty = isaArray(its->ir.vtblType->get());
aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	620 #else
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	621 const llvm::StructType* ivtbl_ty = isaStruct(its->ir.vtblType->get());
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	622 #endif
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	623
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	624 // generate interface info initializer
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	625 std::vector<LLConstant*> infoInits;
136 0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	626
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	627 // classinfo
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	628 assert(id->ir.irStruct->classInfo);
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	629 LLConstant* c = id->ir.irStruct->classInfo;
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	630 infoInits.push_back(c);
136 0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	631
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	632 // vtbl
244 a95056b3c996 [svn r261] Fixed debug info for integer and floating local variables, can now be inspected in GDB. lindquist parents: 217 diff changeset	633 const LLType* byteptrptrty = getPtrToType(getPtrToType(LLType::Int8Ty));
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	634 c = llvm::ConstantExpr::getBitCast(iri->vtbl, byteptrptrty);
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	635 c = DtoConstSlice(DtoConstSize_t(b->vtbl.dim), c);
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	636 infoInits.push_back(c);
136 0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	637
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	638 // offset
137 ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	639 assert(iri->index >= 0);
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	640 size_t ioff = gTargetData->getStructLayout(isaStruct(cd->type->ir.type->get()))->getElementOffset(iri->index);
137 ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	641 infoInits.push_back(DtoConstUint(ioff));
136 0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	642
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	643 // create interface info initializer constant
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	644 iri->infoInit = llvm::cast<llvm::ConstantStruct>(llvm::ConstantStruct::get(iri->infoTy, infoInits));
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	645
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	646 // generate vtable initializer
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	647 std::vector<LLConstant*> iinits;
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	648
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	649 // add interface info
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	650 #if OPAQUE_VTBLS
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	651 const LLType* targetTy = getVoidPtrType();
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	652 iinits.push_back(llvm::ConstantExpr::getBitCast(iri->info, targetTy));
aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	653 #else
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	654 iinits.push_back(iri->info);
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	655 #endif
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	656
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	657 for (int k=1; k < b->vtbl.dim; k++)
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	658 {
622 26fce59fe80a Wrapped all the most potentially expensive logging calls in a conditional to only do work when actually requested. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 618 diff changeset	659 // Logger::println("interface vtbl const init nr. %d", k);
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	660 Dsymbol* dsym = (Dsymbol*)b->vtbl.data[k];
423 3424f0fab7a9 Error instead of assert on unimplemented interface functions. Christian Kamm <kamm incasoftware de> parents: 422 diff changeset	661
3424f0fab7a9 Error instead of assert on unimplemented interface functions. Christian Kamm <kamm incasoftware de> parents: 422 diff changeset	662 // error on unimplemented functions, error was already generated earlier
3424f0fab7a9 Error instead of assert on unimplemented interface functions. Christian Kamm <kamm incasoftware de> parents: 422 diff changeset	663 if(!dsym)
3424f0fab7a9 Error instead of assert on unimplemented interface functions. Christian Kamm <kamm incasoftware de> parents: 422 diff changeset	664 fatal();
3424f0fab7a9 Error instead of assert on unimplemented interface functions. Christian Kamm <kamm incasoftware de> parents: 422 diff changeset	665
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	666 FuncDeclaration* fd = dsym->isFuncDeclaration();
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	667 assert(fd);
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	668 DtoForceDeclareDsymbol(fd);
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	669 assert(fd->ir.irFunc->func);
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	670 LLConstant* c = llvm::cast<llvm::Constant>(fd->ir.irFunc->func);
136 0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	671
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	672 #if !OPAQUE_VTBLS
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	673 const LLType* targetTy = iri->vtblTy->getContainedType(k);
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	674 #endif
aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	675
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	676 // we have to bitcast, as the type created in ResolveClass expects a different this type
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	677 c = llvm::ConstantExpr::getBitCast(c, targetTy);
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	678 iinits.push_back(c);
622 26fce59fe80a Wrapped all the most potentially expensive logging calls in a conditional to only do work when actually requested. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 618 diff changeset	679 // if (Logger::enabled())
26fce59fe80a Wrapped all the most potentially expensive logging calls in a conditional to only do work when actually requested. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 618 diff changeset	680 // Logger::cout() << "c: " << *c << '\n';
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	681 }
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	682
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	683 #if OPAQUE_VTBLS
622 26fce59fe80a Wrapped all the most potentially expensive logging calls in a conditional to only do work when actually requested. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 618 diff changeset	684 // if (Logger::enabled())
26fce59fe80a Wrapped all the most potentially expensive logging calls in a conditional to only do work when actually requested. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 618 diff changeset	685 // Logger::cout() << "n: " << iinits.size() << " ivtbl_ty: " << *ivtbl_ty << '\n';
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	686 LLConstant* civtblInit = llvm::ConstantArray::get(ivtbl_ty, iinits);
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	687 iri->vtblInit = llvm::cast<llvm::ConstantArray>(civtblInit);
aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	688 #else
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	689 LLConstant* civtblInit = llvm::ConstantStruct::get(ivtbl_ty, iinits);
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	690 iri->vtblInit = llvm::cast<llvm::ConstantStruct>(civtblInit);
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	691 #endif
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	692 }
136 0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	693 }
0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	694 // we always generate interfaceinfos as best we can
177 cea8dcfa76df [svn r193] Fixed: abstract classes implementing interfaces now output proper Interface info arrays. (null vtables). lindquist parents: 173 diff changeset	695 else
136 0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	696 {
177 cea8dcfa76df [svn r193] Fixed: abstract classes implementing interfaces now output proper Interface info arrays. (null vtables). lindquist parents: 173 diff changeset	697 // TODO: this is duplicated code from right above... I'm just too lazy to generalise it right now :/
cea8dcfa76df [svn r193] Fixed: abstract classes implementing interfaces now output proper Interface info arrays. (null vtables). lindquist parents: 173 diff changeset	698 // create interface vtable const initalizers
cea8dcfa76df [svn r193] Fixed: abstract classes implementing interfaces now output proper Interface info arrays. (null vtables). lindquist parents: 173 diff changeset	699 for (IrStruct::InterfaceVectorIter i=irstruct->interfaceVec.begin(); i!=irstruct->interfaceVec.end(); ++i)
136 0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	700 {
177 cea8dcfa76df [svn r193] Fixed: abstract classes implementing interfaces now output proper Interface info arrays. (null vtables). lindquist parents: 173 diff changeset	701 IrInterface* iri = *i;
cea8dcfa76df [svn r193] Fixed: abstract classes implementing interfaces now output proper Interface info arrays. (null vtables). lindquist parents: 173 diff changeset	702 BaseClass* b = iri->base;
cea8dcfa76df [svn r193] Fixed: abstract classes implementing interfaces now output proper Interface info arrays. (null vtables). lindquist parents: 173 diff changeset	703
cea8dcfa76df [svn r193] Fixed: abstract classes implementing interfaces now output proper Interface info arrays. (null vtables). lindquist parents: 173 diff changeset	704 ClassDeclaration* id = iri->decl;
136 0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	705 assert(id->type->ty == Tclass);
0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	706 TypeClass* its = (TypeClass*)id->type;
0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	707
0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	708 // generate interface info initializer
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	709 std::vector<LLConstant*> infoInits;
136 0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	710
0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	711 // classinfo
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	712 assert(id->ir.irStruct->classInfo);
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	713 LLConstant* c = id->ir.irStruct->classInfo;
136 0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	714 infoInits.push_back(c);
0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	715
0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	716 // vtbl
244 a95056b3c996 [svn r261] Fixed debug info for integer and floating local variables, can now be inspected in GDB. lindquist parents: 217 diff changeset	717 const LLType* byteptrptrty = getPtrToType(getPtrToType(LLType::Int8Ty));
136 0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	718 c = DtoConstSlice(DtoConstSize_t(0), getNullPtr(byteptrptrty));
0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	719 infoInits.push_back(c);
0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	720
0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	721 // offset
177 cea8dcfa76df [svn r193] Fixed: abstract classes implementing interfaces now output proper Interface info arrays. (null vtables). lindquist parents: 173 diff changeset	722 assert(iri->index >= 0);
cea8dcfa76df [svn r193] Fixed: abstract classes implementing interfaces now output proper Interface info arrays. (null vtables). lindquist parents: 173 diff changeset	723 size_t ioff = gTargetData->getStructLayout(isaStruct(cd->type->ir.type->get()))->getElementOffset(iri->index);
cea8dcfa76df [svn r193] Fixed: abstract classes implementing interfaces now output proper Interface info arrays. (null vtables). lindquist parents: 173 diff changeset	724 infoInits.push_back(DtoConstUint(ioff));
136 0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	725
0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	726 // create interface info initializer constant
0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	727 iri->infoInit = llvm::cast<llvm::ConstantStruct>(llvm::ConstantStruct::get(iri->infoTy, infoInits));
0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	728 }
177 cea8dcfa76df [svn r193] Fixed: abstract classes implementing interfaces now output proper Interface info arrays. (null vtables). lindquist parents: 173 diff changeset	729 }
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	730
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	731 gIR->classes.pop_back();
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	732 gIR->structs.pop_back();
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	733 }
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	734
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	735 //////////////////////////////////////////////////////////////////////////////////////////
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	736
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	737 void DtoDefineClass(ClassDeclaration* cd)
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	738 {
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	739 if (cd->ir.defined) return;
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	740 cd->ir.defined = true;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	741
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	742 Logger::println("DtoDefineClass(%s): %s", cd->toPrettyChars(), cd->loc.toChars());
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	743 LOG_SCOPE;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	744
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	745 // get the struct (class) type
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	746 assert(cd->type->ty == Tclass);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	747 TypeClass* ts = (TypeClass*)cd->type;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	748
147 0636f6269dfd [svn r152] Relates to ticket #34. Always emit class definition if it is a template instance. Linkage still needs to be fixed. ChristianK parents: 142 diff changeset	749 if (cd->getModule() == gIR->dmodule \|\| DtoIsTemplateInstance(cd)) {
177 cea8dcfa76df [svn r193] Fixed: abstract classes implementing interfaces now output proper Interface info arrays. (null vtables). lindquist parents: 173 diff changeset	750
cea8dcfa76df [svn r193] Fixed: abstract classes implementing interfaces now output proper Interface info arrays. (null vtables). lindquist parents: 173 diff changeset	751 // interfaces don't have static initializer/vtable
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	752 // neither do abstract classes
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	753 if (!cd->isInterfaceDeclaration() && !cd->isAbstract())
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	754 {
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	755 cd->ir.irStruct->init->setInitializer(cd->ir.irStruct->constInit);
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	756 cd->ir.irStruct->vtbl->setInitializer(cd->ir.irStruct->constVtbl);
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	757
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	758 // initialize interface vtables
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	759 IrStruct* irstruct = cd->ir.irStruct;
142 a123dca8349b [svn r146] fixed some potential problems with mismatch in order of interfaces in class data layout lindquist parents: 138 diff changeset	760 for (IrStruct::InterfaceVectorIter i=irstruct->interfaceVec.begin(); i!=irstruct->interfaceVec.end(); ++i)
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	761 {
142 a123dca8349b [svn r146] fixed some potential problems with mismatch in order of interfaces in class data layout lindquist parents: 138 diff changeset	762 IrInterface* iri = *i;
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	763 iri->vtbl->setInitializer(iri->vtblInit);
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	764 }
177 cea8dcfa76df [svn r193] Fixed: abstract classes implementing interfaces now output proper Interface info arrays. (null vtables). lindquist parents: 173 diff changeset	765 }
cea8dcfa76df [svn r193] Fixed: abstract classes implementing interfaces now output proper Interface info arrays. (null vtables). lindquist parents: 173 diff changeset	766
cea8dcfa76df [svn r193] Fixed: abstract classes implementing interfaces now output proper Interface info arrays. (null vtables). lindquist parents: 173 diff changeset	767 // always do interface info array when possible
cea8dcfa76df [svn r193] Fixed: abstract classes implementing interfaces now output proper Interface info arrays. (null vtables). lindquist parents: 173 diff changeset	768 IrStruct* irstruct = cd->ir.irStruct;
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	769 std::vector<LLConstant*> infoInits;
177 cea8dcfa76df [svn r193] Fixed: abstract classes implementing interfaces now output proper Interface info arrays. (null vtables). lindquist parents: 173 diff changeset	770 for (IrStruct::InterfaceVectorIter i=irstruct->interfaceVec.begin(); i!=irstruct->interfaceVec.end(); ++i)
cea8dcfa76df [svn r193] Fixed: abstract classes implementing interfaces now output proper Interface info arrays. (null vtables). lindquist parents: 173 diff changeset	771 {
cea8dcfa76df [svn r193] Fixed: abstract classes implementing interfaces now output proper Interface info arrays. (null vtables). lindquist parents: 173 diff changeset	772 IrInterface* iri = *i;
cea8dcfa76df [svn r193] Fixed: abstract classes implementing interfaces now output proper Interface info arrays. (null vtables). lindquist parents: 173 diff changeset	773 infoInits.push_back(iri->infoInit);
cea8dcfa76df [svn r193] Fixed: abstract classes implementing interfaces now output proper Interface info arrays. (null vtables). lindquist parents: 173 diff changeset	774 }
cea8dcfa76df [svn r193] Fixed: abstract classes implementing interfaces now output proper Interface info arrays. (null vtables). lindquist parents: 173 diff changeset	775 // set initializer
cea8dcfa76df [svn r193] Fixed: abstract classes implementing interfaces now output proper Interface info arrays. (null vtables). lindquist parents: 173 diff changeset	776 if (!infoInits.empty())
cea8dcfa76df [svn r193] Fixed: abstract classes implementing interfaces now output proper Interface info arrays. (null vtables). lindquist parents: 173 diff changeset	777 {
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	778 LLConstant* arrInit = llvm::ConstantArray::get(irstruct->interfaceInfosTy, infoInits);
177 cea8dcfa76df [svn r193] Fixed: abstract classes implementing interfaces now output proper Interface info arrays. (null vtables). lindquist parents: 173 diff changeset	779 irstruct->interfaceInfos->setInitializer(arrInit);
cea8dcfa76df [svn r193] Fixed: abstract classes implementing interfaces now output proper Interface info arrays. (null vtables). lindquist parents: 173 diff changeset	780 }
cea8dcfa76df [svn r193] Fixed: abstract classes implementing interfaces now output proper Interface info arrays. (null vtables). lindquist parents: 173 diff changeset	781 else
cea8dcfa76df [svn r193] Fixed: abstract classes implementing interfaces now output proper Interface info arrays. (null vtables). lindquist parents: 173 diff changeset	782 {
cea8dcfa76df [svn r193] Fixed: abstract classes implementing interfaces now output proper Interface info arrays. (null vtables). lindquist parents: 173 diff changeset	783 assert(irstruct->interfaceInfos == NULL);
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	784 }
123 7f9a0a58394b [svn r127] Updated the lphobos build scripts a little. Created a new rebuild profile. lindquist parents: 121 diff changeset	785
7f9a0a58394b [svn r127] Updated the lphobos build scripts a little. Created a new rebuild profile. lindquist parents: 121 diff changeset	786 // generate classinfo
7f9a0a58394b [svn r127] Updated the lphobos build scripts a little. Created a new rebuild profile. lindquist parents: 121 diff changeset	787 DtoDefineClassInfo(cd);
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	788 }
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	789 }
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	790
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	791 //////////////////////////////////////////////////////////////////////////////////////////
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	792
486 a34078905d01 Added pragma(llvmdc, "string") for misc per-module compiler configuration, currently "string" can only be "verbose" which forces -vv for module it appears in. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 479 diff changeset	793 DValue* DtoNewClass(Loc loc, TypeClass* tc, NewExp* newexp)
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	794 {
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	795 // resolve type
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	796 DtoForceDeclareDsymbol(tc->sym);
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	797
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	798 // allocate
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	799 LLValue* mem;
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	800 if (newexp->onstack)
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	801 {
479 672eb4893b55 Move AllocaInst creation into DtoAlloca helper. Will enable special zero-init of fp80 reals' padding. Christian Kamm <kamm incasoftware de> parents: 423 diff changeset	802 mem = DtoAlloca(DtoType(tc)->getContainedType(0), ".newclass_alloca");
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	803 }
284 70c370e97944 [svn r305] Started support for custom class allocators/deallocators. Allocators with more than one argument still need to be fixed. lindquist parents: 275 diff changeset	804 // custom allocator
70c370e97944 [svn r305] Started support for custom class allocators/deallocators. Allocators with more than one argument still need to be fixed. lindquist parents: 275 diff changeset	805 else if (newexp->allocator)
70c370e97944 [svn r305] Started support for custom class allocators/deallocators. Allocators with more than one argument still need to be fixed. lindquist parents: 275 diff changeset	806 {
414 ac1fcc138e42 Fixed issue with internal real representation, incorrect for non x86-32 architectures. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 370 diff changeset	807 DtoForceDeclareDsymbol(newexp->allocator);
ac1fcc138e42 Fixed issue with internal real representation, incorrect for non x86-32 architectures. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 370 diff changeset	808 DFuncValue dfn(newexp->allocator, newexp->allocator->ir.irFunc->func);
422 fa91b03d9cd7 Error message for calling a function with a missing 'this' arg. Christian Kamm <kamm incasoftware de> parents: 414 diff changeset	809 DValue* res = DtoCallFunction(newexp->loc, NULL, &dfn, newexp->newargs);
414 ac1fcc138e42 Fixed issue with internal real representation, incorrect for non x86-32 architectures. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 370 diff changeset	810 mem = DtoBitCast(res->getRVal(), DtoType(tc), ".newclass_custom");
284 70c370e97944 [svn r305] Started support for custom class allocators/deallocators. Allocators with more than one argument still need to be fixed. lindquist parents: 275 diff changeset	811 }
70c370e97944 [svn r305] Started support for custom class allocators/deallocators. Allocators with more than one argument still need to be fixed. lindquist parents: 275 diff changeset	812 // default allocator
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	813 else
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	814 {
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	815 llvm::Function* fn = LLVM_D_GetRuntimeFunction(gIR->module, "_d_newclass");
414 ac1fcc138e42 Fixed issue with internal real representation, incorrect for non x86-32 architectures. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 370 diff changeset	816 mem = gIR->CreateCallOrInvoke(fn, tc->sym->ir.irStruct->classInfo, ".newclass_gc_alloc")->get();
ac1fcc138e42 Fixed issue with internal real representation, incorrect for non x86-32 architectures. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 370 diff changeset	817 mem = DtoBitCast(mem, DtoType(tc), ".newclass_gc");
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	818 }
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	819
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	820 // init
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	821 DtoInitClass(tc, mem);
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	822
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	823 // init inner-class outer reference
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	824 if (newexp->thisexp)
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	825 {
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	826 Logger::println("Resolving outer class");
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	827 LOG_SCOPE;
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	828 DValue* thisval = newexp->thisexp->toElem(gIR);
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	829 size_t idx = 2 + tc->sym->vthis->ir.irField->index;
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	830 LLValue* src = thisval->getRVal();
7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	831 LLValue* dst = DtoGEPi(mem,0,idx,"tmp");
622 26fce59fe80a Wrapped all the most potentially expensive logging calls in a conditional to only do work when actually requested. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 618 diff changeset	832 if (Logger::enabled())
26fce59fe80a Wrapped all the most potentially expensive logging calls in a conditional to only do work when actually requested. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 618 diff changeset	833 Logger::cout() << "dst: " << dst << "\nsrc: " << src << '\n';
169 2df270e1ba59 [svn r185] Fixed broken nested classes with data members, did DMD change the class layout? tango.text.Regex now compiles. lindquist parents: 163 diff changeset	834 DtoStore(src, dst);
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	835 }
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	836 // set the context for nested classes
486 a34078905d01 Added pragma(llvmdc, "string") for misc per-module compiler configuration, currently "string" can only be "verbose" which forces -vv for module it appears in. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 479 diff changeset	837 else if (tc->sym->isNested() && tc->sym->vthis)
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	838 {
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	839 Logger::println("Resolving nested context");
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	840 LOG_SCOPE;
369 7d91d82000ae [svn r390] Make the zero value used when no nested context was created of the correct type. ChristianK parents: 363 diff changeset	841
486 a34078905d01 Added pragma(llvmdc, "string") for misc per-module compiler configuration, currently "string" can only be "verbose" which forces -vv for module it appears in. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 479 diff changeset	842 // get context
a34078905d01 Added pragma(llvmdc, "string") for misc per-module compiler configuration, currently "string" can only be "verbose" which forces -vv for module it appears in. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 479 diff changeset	843 LLValue* nest = DtoNestedContext(loc, tc->sym);
a34078905d01 Added pragma(llvmdc, "string") for misc per-module compiler configuration, currently "string" can only be "verbose" which forces -vv for module it appears in. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 479 diff changeset	844
a34078905d01 Added pragma(llvmdc, "string") for misc per-module compiler configuration, currently "string" can only be "verbose" which forces -vv for module it appears in. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 479 diff changeset	845 // store into right location
370 051ab876fe11 [svn r391] Fix classes nested inside functions for real. ChristianK parents: 369 diff changeset	846 size_t idx = 2 + tc->sym->vthis->ir.irField->index;
051ab876fe11 [svn r391] Fix classes nested inside functions for real. ChristianK parents: 369 diff changeset	847 LLValue* gep = DtoGEPi(mem,0,idx,"tmp");
486 a34078905d01 Added pragma(llvmdc, "string") for misc per-module compiler configuration, currently "string" can only be "verbose" which forces -vv for module it appears in. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 479 diff changeset	848 DtoStore(DtoBitCast(nest, gep->getType()->getContainedType(0)), gep);
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	849 }
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	850
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	851 // call constructor
160 b77664331d06 [svn r176] Fixed a bug with class constructors. lindquist parents: 157 diff changeset	852 if (newexp->member)
b77664331d06 [svn r176] Fixed a bug with class constructors. lindquist parents: 157 diff changeset	853 {
b77664331d06 [svn r176] Fixed a bug with class constructors. lindquist parents: 157 diff changeset	854 assert(newexp->arguments != NULL);
414 ac1fcc138e42 Fixed issue with internal real representation, incorrect for non x86-32 architectures. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 370 diff changeset	855 DtoForceDeclareDsymbol(newexp->member);
ac1fcc138e42 Fixed issue with internal real representation, incorrect for non x86-32 architectures. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 370 diff changeset	856 DFuncValue dfn(newexp->member, newexp->member->ir.irFunc->func, mem);
422 fa91b03d9cd7 Error message for calling a function with a missing 'this' arg. Christian Kamm <kamm incasoftware de> parents: 414 diff changeset	857 return DtoCallFunction(newexp->loc, tc, &dfn, newexp->arguments);
160 b77664331d06 [svn r176] Fixed a bug with class constructors. lindquist parents: 157 diff changeset	858 }
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	859
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	860 // return default constructed class
486 a34078905d01 Added pragma(llvmdc, "string") for misc per-module compiler configuration, currently "string" can only be "verbose" which forces -vv for module it appears in. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 479 diff changeset	861 return new DImValue(tc, mem);
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	862 }
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	863
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	864 //////////////////////////////////////////////////////////////////////////////////////////
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	865
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	866 void DtoInitClass(TypeClass* tc, LLValue* dst)
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	867 {
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	868 size_t presz = 2*getABITypeSize(DtoSize_t());
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	869 uint64_t n = getABITypeSize(tc->ir.type->get()) - presz;
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	870
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	871 // set vtable field seperately, this might give better optimization
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	872 assert(tc->sym->ir.irStruct->vtbl);
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	873 DtoStore(tc->sym->ir.irStruct->vtbl, DtoGEPi(dst,0,0,"vtbl"));
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	874
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	875 // monitor always defaults to zero
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	876 LLValue* tmp = DtoGEPi(dst,0,1,"monitor");
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	877 DtoStore(llvm::Constant::getNullValue(tmp->getType()->getContainedType(0)), tmp);
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	878
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	879 // done?
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	880 if (n == 0)
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	881 return;
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	882
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	883 // copy the rest from the static initializer
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	884 assert(tc->sym->ir.irStruct->init);
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	885 assert(dst->getType() == tc->sym->ir.irStruct->init->getType());
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	886
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	887 LLValue* dstarr = DtoGEPi(dst,0,2,"tmp");
7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	888 LLValue* srcarr = DtoGEPi(tc->sym->ir.irStruct->init,0,2,"tmp");
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	889
244 a95056b3c996 [svn r261] Fixed debug info for integer and floating local variables, can now be inspected in GDB. lindquist parents: 217 diff changeset	890 DtoMemCpy(dstarr, srcarr, DtoConstSize_t(n));
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	891 }
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	892
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	893 //////////////////////////////////////////////////////////////////////////////////////////
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	894
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	895 void DtoFinalizeClass(LLValue* inst)
209 c4c9b4ac021b [svn r225] Fixed: delete expressions no longer use llvm's free instruction, which crashes on a GC provided pointer. lindquist parents: 205 diff changeset	896 {
c4c9b4ac021b [svn r225] Fixed: delete expressions no longer use llvm's free instruction, which crashes on a GC provided pointer. lindquist parents: 205 diff changeset	897 // get runtime function
c4c9b4ac021b [svn r225] Fixed: delete expressions no longer use llvm's free instruction, which crashes on a GC provided pointer. lindquist parents: 205 diff changeset	898 llvm::Function* fn = LLVM_D_GetRuntimeFunction(gIR->module, "_d_callfinalizer");
c4c9b4ac021b [svn r225] Fixed: delete expressions no longer use llvm's free instruction, which crashes on a GC provided pointer. lindquist parents: 205 diff changeset	899 // build args
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	900 LLSmallVector<LLValue*,1> arg;
209 c4c9b4ac021b [svn r225] Fixed: delete expressions no longer use llvm's free instruction, which crashes on a GC provided pointer. lindquist parents: 205 diff changeset	901 arg.push_back(DtoBitCast(inst, fn->getFunctionType()->getParamType(0), ".tmp"));
c4c9b4ac021b [svn r225] Fixed: delete expressions no longer use llvm's free instruction, which crashes on a GC provided pointer. lindquist parents: 205 diff changeset	902 // call
315 a9697749e898 [svn r336] Made sure calls within a landing pad area are invokes. ChristianK parents: 309 diff changeset	903 gIR->CreateCallOrInvoke(fn, arg.begin(), arg.end(), "");
209 c4c9b4ac021b [svn r225] Fixed: delete expressions no longer use llvm's free instruction, which crashes on a GC provided pointer. lindquist parents: 205 diff changeset	904 }
c4c9b4ac021b [svn r225] Fixed: delete expressions no longer use llvm's free instruction, which crashes on a GC provided pointer. lindquist parents: 205 diff changeset	905
c4c9b4ac021b [svn r225] Fixed: delete expressions no longer use llvm's free instruction, which crashes on a GC provided pointer. lindquist parents: 205 diff changeset	906 //////////////////////////////////////////////////////////////////////////////////////////
c4c9b4ac021b [svn r225] Fixed: delete expressions no longer use llvm's free instruction, which crashes on a GC provided pointer. lindquist parents: 205 diff changeset	907
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	908 DValue* DtoCastClass(DValue* val, Type* _to)
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	909 {
138 aeddd4d533b3 [svn r142] minor fix to dynamic casts. lindquist parents: 137 diff changeset	910 Logger::println("DtoCastClass(%s, %s)", val->getType()->toChars(), _to->toChars());
aeddd4d533b3 [svn r142] minor fix to dynamic casts. lindquist parents: 137 diff changeset	911 LOG_SCOPE;
aeddd4d533b3 [svn r142] minor fix to dynamic casts. lindquist parents: 137 diff changeset	912
486 a34078905d01 Added pragma(llvmdc, "string") for misc per-module compiler configuration, currently "string" can only be "verbose" which forces -vv for module it appears in. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 479 diff changeset	913 Type* to = _to->toBasetype();
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	914 if (to->ty == Tpointer) {
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	915 const LLType* tolltype = DtoType(_to);
7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	916 LLValue* rval = DtoBitCast(val->getRVal(), tolltype);
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	917 return new DImValue(_to, rval);
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	918 }
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	919
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	920 assert(to->ty == Tclass);
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	921 TypeClass* tc = (TypeClass*)to;
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	922
486 a34078905d01 Added pragma(llvmdc, "string") for misc per-module compiler configuration, currently "string" can only be "verbose" which forces -vv for module it appears in. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 479 diff changeset	923 Type* from = val->getType()->toBasetype();
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	924 TypeClass* fc = (TypeClass*)from;
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	925
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	926 if (tc->sym->isInterfaceDeclaration()) {
138 aeddd4d533b3 [svn r142] minor fix to dynamic casts. lindquist parents: 137 diff changeset	927 Logger::println("to interface");
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	928 if (fc->sym->isInterfaceDeclaration()) {
138 aeddd4d533b3 [svn r142] minor fix to dynamic casts. lindquist parents: 137 diff changeset	929 Logger::println("from interface");
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	930 return DtoDynamicCastInterface(val, _to);
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	931 }
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	932 else {
138 aeddd4d533b3 [svn r142] minor fix to dynamic casts. lindquist parents: 137 diff changeset	933 Logger::println("from object");
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	934 return DtoDynamicCastObject(val, _to);
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	935 }
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	936 }
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	937 else {
138 aeddd4d533b3 [svn r142] minor fix to dynamic casts. lindquist parents: 137 diff changeset	938 Logger::println("to object");
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	939 int poffset;
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	940 if (fc->sym->isInterfaceDeclaration()) {
138 aeddd4d533b3 [svn r142] minor fix to dynamic casts. lindquist parents: 137 diff changeset	941 Logger::println("interface cast");
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	942 return DtoCastInterfaceToObject(val, _to);
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	943 }
138 aeddd4d533b3 [svn r142] minor fix to dynamic casts. lindquist parents: 137 diff changeset	944 else if (!tc->sym->isInterfaceDeclaration() && tc->sym->isBaseOf(fc->sym,NULL)) {
aeddd4d533b3 [svn r142] minor fix to dynamic casts. lindquist parents: 137 diff changeset	945 Logger::println("static down cast)");
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	946 const LLType* tolltype = DtoType(_to);
7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	947 LLValue* rval = DtoBitCast(val->getRVal(), tolltype);
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	948 return new DImValue(_to, rval);
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	949 }
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	950 else {
138 aeddd4d533b3 [svn r142] minor fix to dynamic casts. lindquist parents: 137 diff changeset	951 Logger::println("dynamic up cast");
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	952 return DtoDynamicCastObject(val, _to);
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	953 }
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	954 }
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	955 }
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	956
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	957 //////////////////////////////////////////////////////////////////////////////////////////
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	958
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	959 DValue* DtoDynamicCastObject(DValue* val, Type* _to)
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	960 {
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	961 // call:
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	962 // Object _d_dynamic_cast(Object o, ClassInfo c)
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	963
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	964 DtoForceDeclareDsymbol(ClassDeclaration::object);
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	965 DtoForceDeclareDsymbol(ClassDeclaration::classinfo);
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	966
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	967 llvm::Function* func = LLVM_D_GetRuntimeFunction(gIR->module, "_d_dynamic_cast");
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	968 const llvm::FunctionType* funcTy = func->getFunctionType();
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	969
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	970 std::vector<LLValue*> args;
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	971
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	972 // Object o
217 0806379a5eca [svn r233] Added: -oq command line option for writing fully qualified object names. lindquist parents: 213 diff changeset	973 LLValue* obj = val->getRVal();
0806379a5eca [svn r233] Added: -oq command line option for writing fully qualified object names. lindquist parents: 213 diff changeset	974 obj = DtoBitCast(obj, funcTy->getParamType(0));
0806379a5eca [svn r233] Added: -oq command line option for writing fully qualified object names. lindquist parents: 213 diff changeset	975 assert(funcTy->getParamType(0) == obj->getType());
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	976
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	977 // ClassInfo c
486 a34078905d01 Added pragma(llvmdc, "string") for misc per-module compiler configuration, currently "string" can only be "verbose" which forces -vv for module it appears in. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 479 diff changeset	978 TypeClass* to = (TypeClass*)_to->toBasetype();
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	979 DtoForceDeclareDsymbol(to->sym);
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	980 assert(to->sym->ir.irStruct->classInfo);
217 0806379a5eca [svn r233] Added: -oq command line option for writing fully qualified object names. lindquist parents: 213 diff changeset	981 LLValue* cinfo = to->sym->ir.irStruct->classInfo;
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	982 // unfortunately this is needed as the implementation of object differs somehow from the declaration
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	983 // this could happen in user code as well :/
217 0806379a5eca [svn r233] Added: -oq command line option for writing fully qualified object names. lindquist parents: 213 diff changeset	984 cinfo = DtoBitCast(cinfo, funcTy->getParamType(1));
0806379a5eca [svn r233] Added: -oq command line option for writing fully qualified object names. lindquist parents: 213 diff changeset	985 assert(funcTy->getParamType(1) == cinfo->getType());
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	986
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	987 // call it
315 a9697749e898 [svn r336] Made sure calls within a landing pad area are invokes. ChristianK parents: 309 diff changeset	988 LLValue* ret = gIR->CreateCallOrInvoke2(func, obj, cinfo, "tmp")->get();
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	989
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	990 // cast return value
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	991 ret = DtoBitCast(ret, DtoType(_to));
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	992
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	993 return new DImValue(_to, ret);
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	994 }
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	995
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	996 //////////////////////////////////////////////////////////////////////////////////////////
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	997
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	998 DValue* DtoCastInterfaceToObject(DValue* val, Type* to)
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	999 {
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1000 // call:
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1001 // Object _d_toObject(void* p)
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1002
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1003 llvm::Function* func = LLVM_D_GetRuntimeFunction(gIR->module, "_d_toObject");
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1004 const llvm::FunctionType* funcTy = func->getFunctionType();
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1005
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1006 // void* p
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	1007 LLValue* tmp = val->getRVal();
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1008 tmp = DtoBitCast(tmp, funcTy->getParamType(0));
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1009
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1010 // call it
315 a9697749e898 [svn r336] Made sure calls within a landing pad area are invokes. ChristianK parents: 309 diff changeset	1011 LLValue* ret = gIR->CreateCallOrInvoke(func, tmp, "tmp")->get();
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1012
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1013 // cast return value
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1014 if (to != NULL)
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1015 ret = DtoBitCast(ret, DtoType(to));
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1016 else
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1017 to = ClassDeclaration::object->type;
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1018
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1019 return new DImValue(to, ret);
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1020 }
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1021
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1022 //////////////////////////////////////////////////////////////////////////////////////////
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1023
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1024 DValue* DtoDynamicCastInterface(DValue* val, Type* _to)
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1025 {
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1026 // call:
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1027 // Object _d_interface_cast(void* p, ClassInfo c)
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1028
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1029 DtoForceDeclareDsymbol(ClassDeclaration::object);
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1030 DtoForceDeclareDsymbol(ClassDeclaration::classinfo);
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1031
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1032 llvm::Function* func = LLVM_D_GetRuntimeFunction(gIR->module, "_d_interface_cast");
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1033 const llvm::FunctionType* funcTy = func->getFunctionType();
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1034
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	1035 std::vector<LLValue*> args;
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1036
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1037 // void* p
217 0806379a5eca [svn r233] Added: -oq command line option for writing fully qualified object names. lindquist parents: 213 diff changeset	1038 LLValue* ptr = val->getRVal();
0806379a5eca [svn r233] Added: -oq command line option for writing fully qualified object names. lindquist parents: 213 diff changeset	1039 ptr = DtoBitCast(ptr, funcTy->getParamType(0));
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1040
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1041 // ClassInfo c
486 a34078905d01 Added pragma(llvmdc, "string") for misc per-module compiler configuration, currently "string" can only be "verbose" which forces -vv for module it appears in. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 479 diff changeset	1042 TypeClass* to = (TypeClass*)_to->toBasetype();
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1043 DtoForceDeclareDsymbol(to->sym);
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	1044 assert(to->sym->ir.irStruct->classInfo);
217 0806379a5eca [svn r233] Added: -oq command line option for writing fully qualified object names. lindquist parents: 213 diff changeset	1045 LLValue* cinfo = to->sym->ir.irStruct->classInfo;
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1046 // unfortunately this is needed as the implementation of object differs somehow from the declaration
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1047 // this could happen in user code as well :/
217 0806379a5eca [svn r233] Added: -oq command line option for writing fully qualified object names. lindquist parents: 213 diff changeset	1048 cinfo = DtoBitCast(cinfo, funcTy->getParamType(1));
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1049
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1050 // call it
315 a9697749e898 [svn r336] Made sure calls within a landing pad area are invokes. ChristianK parents: 309 diff changeset	1051 LLValue* ret = gIR->CreateCallOrInvoke2(func, ptr, cinfo, "tmp")->get();
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1052
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1053 // cast return value
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1054 ret = DtoBitCast(ret, DtoType(_to));
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1055
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1056 return new DImValue(_to, ret);
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1057 }
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1058
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1059 //////////////////////////////////////////////////////////////////////////////////////////
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1060
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1061 static unsigned LLVM_ClassOffsetToIndex(ClassDeclaration* cd, unsigned os, unsigned& idx)
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1062 {
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1063 // start at the bottom of the inheritance chain
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1064 if (cd->baseClass != 0) {
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1065 unsigned o = LLVM_ClassOffsetToIndex(cd->baseClass, os, idx);
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1066 if (o != (unsigned)-1)
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1067 return o;
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1068 }
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1069
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1070 // check this class
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1071 unsigned i;
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1072 for (i=0; i<cd->fields.dim; ++i) {
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1073 VarDeclaration* vd = (VarDeclaration*)cd->fields.data[i];
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1074 if (os == vd->offset)
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1075 return i+idx;
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1076 }
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1077 idx += i;
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1078
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1079 return (unsigned)-1;
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1080 }
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1081
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1082 //////////////////////////////////////////////////////////////////////////////////////////
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1083
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1084 void ClassDeclaration::offsetToIndex(Type* t, unsigned os, std::vector<unsigned>& result)
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1085 {
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1086 unsigned idx = 0;
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1087 unsigned r = LLVM_ClassOffsetToIndex(this, os, idx);
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1088 assert(r != (unsigned)-1 && "Offset not found in any aggregate field");
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1089 // vtable is 0, monitor is 1
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1090 r += 2;
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1091 // the final index was not pushed
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1092 result.push_back(r);
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1093 }
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1094
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1095 //////////////////////////////////////////////////////////////////////////////////////////
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1096
705 5a2983f97498 Fixed weird struct problem from downs, see mini/compile_structs1.d Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 669 diff changeset	1097 LLValue* DtoIndexClass(LLValue* src, ClassDeclaration* cd, VarDeclaration* vd)
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1098 {
705 5a2983f97498 Fixed weird struct problem from downs, see mini/compile_structs1.d Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 669 diff changeset	1099 Logger::println("indexing class field %s:", vd->toPrettyChars());
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1100 LOG_SCOPE;
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1101
705 5a2983f97498 Fixed weird struct problem from downs, see mini/compile_structs1.d Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 669 diff changeset	1102 if (Logger::enabled())
5a2983f97498 Fixed weird struct problem from downs, see mini/compile_structs1.d Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 669 diff changeset	1103 Logger::cout() << "src: " << *src << '\n';
5a2983f97498 Fixed weird struct problem from downs, see mini/compile_structs1.d Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 669 diff changeset	1104
5a2983f97498 Fixed weird struct problem from downs, see mini/compile_structs1.d Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 669 diff changeset	1105 // vd must be a field
5a2983f97498 Fixed weird struct problem from downs, see mini/compile_structs1.d Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 669 diff changeset	1106 IrField* field = vd->ir.irField;
5a2983f97498 Fixed weird struct problem from downs, see mini/compile_structs1.d Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 669 diff changeset	1107 assert(field);
5a2983f97498 Fixed weird struct problem from downs, see mini/compile_structs1.d Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 669 diff changeset	1108
5a2983f97498 Fixed weird struct problem from downs, see mini/compile_structs1.d Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 669 diff changeset	1109 unsigned idx = field->index + 2; // vtbl & monitor
5a2983f97498 Fixed weird struct problem from downs, see mini/compile_structs1.d Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 669 diff changeset	1110 unsigned off = field->indexOffset;
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1111
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	1112 const LLType* st = DtoType(cd->type);
705 5a2983f97498 Fixed weird struct problem from downs, see mini/compile_structs1.d Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 669 diff changeset	1113 src = DtoBitCast(src, st);
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1114
705 5a2983f97498 Fixed weird struct problem from downs, see mini/compile_structs1.d Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 669 diff changeset	1115 LLValue* val = DtoGEPi(src, 0,idx);
5a2983f97498 Fixed weird struct problem from downs, see mini/compile_structs1.d Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 669 diff changeset	1116 val = DtoBitCast(val, getPtrToType(DtoType(vd->type)));
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1117
705 5a2983f97498 Fixed weird struct problem from downs, see mini/compile_structs1.d Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 669 diff changeset	1118 if (off)
5a2983f97498 Fixed weird struct problem from downs, see mini/compile_structs1.d Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 669 diff changeset	1119 val = DtoGEPi1(val, off);
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1120
705 5a2983f97498 Fixed weird struct problem from downs, see mini/compile_structs1.d Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 669 diff changeset	1121 if (Logger::enabled())
5a2983f97498 Fixed weird struct problem from downs, see mini/compile_structs1.d Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 669 diff changeset	1122 Logger::cout() << "value: " << *val << '\n';
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1123
705 5a2983f97498 Fixed weird struct problem from downs, see mini/compile_structs1.d Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 669 diff changeset	1124 return val;
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1125 }
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1126
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1127 //////////////////////////////////////////////////////////////////////////////////////////
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1128
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	1129 LLValue* DtoVirtualFunctionPointer(DValue* inst, FuncDeclaration* fdecl)
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1130 {
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1131 assert(fdecl->isVirtual());//fdecl->isAbstract() \|\| (!fdecl->isFinal() && fdecl->isVirtual()));
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1132 assert(fdecl->vtblIndex > 0);
486 a34078905d01 Added pragma(llvmdc, "string") for misc per-module compiler configuration, currently "string" can only be "verbose" which forces -vv for module it appears in. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 479 diff changeset	1133 assert(inst->getType()->toBasetype()->ty == Tclass);
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1134
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	1135 LLValue* vthis = inst->getRVal();
622 26fce59fe80a Wrapped all the most potentially expensive logging calls in a conditional to only do work when actually requested. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 618 diff changeset	1136 if (Logger::enabled())
26fce59fe80a Wrapped all the most potentially expensive logging calls in a conditional to only do work when actually requested. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 618 diff changeset	1137 Logger::cout() << "vthis: " << *vthis << '\n';
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1138
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	1139 LLValue* funcval;
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1140 funcval = DtoGEPi(vthis, 0, 0, "tmp");
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1141 funcval = DtoLoad(funcval);
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1142 funcval = DtoGEPi(funcval, 0, fdecl->vtblIndex, fdecl->toPrettyChars());
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1143 funcval = DtoLoad(funcval);
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1144
622 26fce59fe80a Wrapped all the most potentially expensive logging calls in a conditional to only do work when actually requested. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 618 diff changeset	1145 if (Logger::enabled())
26fce59fe80a Wrapped all the most potentially expensive logging calls in a conditional to only do work when actually requested. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 618 diff changeset	1146 Logger::cout() << "funcval: " << *funcval << '\n';
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	1147
aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	1148 #if OPAQUE_VTBLS
aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	1149 funcval = DtoBitCast(funcval, getPtrToType(DtoType(fdecl->type)));
622 26fce59fe80a Wrapped all the most potentially expensive logging calls in a conditional to only do work when actually requested. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 618 diff changeset	1150 if (Logger::enabled())
26fce59fe80a Wrapped all the most potentially expensive logging calls in a conditional to only do work when actually requested. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 618 diff changeset	1151 Logger::cout() << "funcval casted: " << *funcval << '\n';
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	1152 #endif
aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	1153
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1154 return funcval;
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1155 }
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1156
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1157 //////////////////////////////////////////////////////////////////////////////////////////
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1158
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1159 void DtoDeclareClassInfo(ClassDeclaration* cd)
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1160 {
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	1161 if (cd->ir.irStruct->classDeclared) return;
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	1162 cd->ir.irStruct->classDeclared = true;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1163
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	1164 Logger::println("DtoDeclareClassInfo(%s)", cd->toChars());
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1165 LOG_SCOPE;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1166
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1167 ClassDeclaration* cinfo = ClassDeclaration::classinfo;
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	1168 DtoResolveClass(cinfo);
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1169
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1170 std::string gname("_D");
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1171 gname.append(cd->mangle());
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1172 if (!cd->isInterfaceDeclaration())
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1173 gname.append("7__ClassZ");
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1174 else
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1175 gname.append("11__InterfaceZ");
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1176
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	1177 const LLType* st = cinfo->type->ir.type->get();
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	1178
309 d59c363fccad [svn r330] Implemented synchronized statements. lindquist parents: 307 diff changeset	1179 cd->ir.irStruct->classInfo = new llvm::GlobalVariable(st, false, DtoLinkage(cd), NULL, gname, gIR->module);
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1180 }
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1181
271 1e6e2b5d5bfe [svn r292] Fixed: string switch was broken in several ways. lindquist parents: 268 diff changeset	1182 static LLConstant* build_offti_entry(ClassDeclaration* cd, VarDeclaration* vd)
110 e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1183 {
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	1184 std::vector<const LLType*> types;
7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	1185 std::vector<LLConstant*> inits;
110 e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1186
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1187 types.push_back(DtoSize_t());
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1188
271 1e6e2b5d5bfe [svn r292] Fixed: string switch was broken in several ways. lindquist parents: 268 diff changeset	1189 assert(vd->ir.irField);
1e6e2b5d5bfe [svn r292] Fixed: string switch was broken in several ways. lindquist parents: 268 diff changeset	1190 assert(vd->ir.irField->index >= 0);
1e6e2b5d5bfe [svn r292] Fixed: string switch was broken in several ways. lindquist parents: 268 diff changeset	1191 size_t offset = gTargetData->getStructLayout(isaStruct(cd->type->ir.type->get()))->getElementOffset(vd->ir.irField->index+2);
110 e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1192 inits.push_back(DtoConstSize_t(offset));
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1193
275 665b81613475 [svn r296] Removed: the 'suite' dir, it never took off! lindquist parents: 271 diff changeset	1194 LLConstant* c = DtoTypeInfoOf(vd->type, true);
665b81613475 [svn r296] Removed: the 'suite' dir, it never took off! lindquist parents: 271 diff changeset	1195 const LLType* tiTy = c->getType();
123 7f9a0a58394b [svn r127] Updated the lphobos build scripts a little. Created a new rebuild profile. lindquist parents: 121 diff changeset	1196 //Logger::cout() << "tiTy = " << *tiTy << '\n';
110 e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1197
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1198 types.push_back(tiTy);
275 665b81613475 [svn r296] Removed: the 'suite' dir, it never took off! lindquist parents: 271 diff changeset	1199 inits.push_back(c);
110 e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1200
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1201 const llvm::StructType* sTy = llvm::StructType::get(types);
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1202 return llvm::ConstantStruct::get(sTy, inits);
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1203 }
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1204
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	1205 static LLConstant* build_offti_array(ClassDeclaration* cd, LLConstant* init)
110 e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1206 {
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1207 const llvm::StructType* initTy = isaStruct(init->getType());
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1208 assert(initTy);
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1209
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	1210 std::vector<LLConstant*> arrayInits;
110 e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1211 for (ClassDeclaration *cd2 = cd; cd2; cd2 = cd2->baseClass)
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1212 {
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1213 if (cd2->members)
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1214 {
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1215 for (size_t i = 0; i < cd2->members->dim; i++)
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1216 {
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1217 Dsymbol sm = (Dsymbol )cd2->members->data[i];
112 368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1218 if (VarDeclaration* vd = sm->isVarDeclaration()) // is this enough?
110 e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1219 {
275 665b81613475 [svn r296] Removed: the 'suite' dir, it never took off! lindquist parents: 271 diff changeset	1220 if (!vd->isDataseg()) // static members dont have an offset!
665b81613475 [svn r296] Removed: the 'suite' dir, it never took off! lindquist parents: 271 diff changeset	1221 {
665b81613475 [svn r296] Removed: the 'suite' dir, it never took off! lindquist parents: 271 diff changeset	1222 LLConstant* c = build_offti_entry(cd, vd);
665b81613475 [svn r296] Removed: the 'suite' dir, it never took off! lindquist parents: 271 diff changeset	1223 assert(c);
665b81613475 [svn r296] Removed: the 'suite' dir, it never took off! lindquist parents: 271 diff changeset	1224 arrayInits.push_back(c);
665b81613475 [svn r296] Removed: the 'suite' dir, it never took off! lindquist parents: 271 diff changeset	1225 }
110 e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1226 }
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1227 }
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1228 }
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1229 }
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1230
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1231 size_t ninits = arrayInits.size();
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	1232 LLConstant* size = DtoConstSize_t(ninits);
7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	1233 LLConstant* ptr;
110 e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1234
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1235 if (ninits > 0) {
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1236 // OffsetTypeInfo type
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	1237 std::vector<const LLType*> elemtypes;
110 e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1238 elemtypes.push_back(DtoSize_t());
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	1239 const LLType* tiTy = getPtrToType(Type::typeinfo->type->ir.type->get());
110 e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1240 elemtypes.push_back(tiTy);
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1241 const llvm::StructType* sTy = llvm::StructType::get(elemtypes);
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1242
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1243 // array type
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1244 const llvm::ArrayType* arrTy = llvm::ArrayType::get(sTy, ninits);
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	1245 LLConstant* arrInit = llvm::ConstantArray::get(arrTy, arrayInits);
110 e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1246
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1247 std::string name(cd->type->vtinfo->toChars());
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1248 name.append("__OffsetTypeInfos");
149 4c577c2b7229 [svn r155] Fixed a bunch of linkage problems (especially with templates) lindquist parents: 147 diff changeset	1249
4c577c2b7229 [svn r155] Fixed a bunch of linkage problems (especially with templates) lindquist parents: 147 diff changeset	1250 llvm::GlobalVariable* gvar = new llvm::GlobalVariable(arrTy,true,DtoInternalLinkage(cd),arrInit,name,gIR->module);
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1251 ptr = llvm::ConstantExpr::getBitCast(gvar, getPtrToType(sTy));
110 e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1252 }
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1253 else {
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1254 ptr = llvm::ConstantPointerNull::get(isaPointer(initTy->getElementType(1)));
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1255 }
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1256
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1257 return DtoConstSlice(size, ptr);
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1258 }
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1259
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	1260 static LLConstant* build_class_dtor(ClassDeclaration* cd)
112 368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1261 {
268 23d0d9855cad [svn r289] Fixed: right shift >> was broken for unsigned types. lindquist parents: 244 diff changeset	1262 FuncDeclaration* dtor = cd->dtor;
23d0d9855cad [svn r289] Fixed: right shift >> was broken for unsigned types. lindquist parents: 244 diff changeset	1263
23d0d9855cad [svn r289] Fixed: right shift >> was broken for unsigned types. lindquist parents: 244 diff changeset	1264 // if no destructor emit a null
23d0d9855cad [svn r289] Fixed: right shift >> was broken for unsigned types. lindquist parents: 244 diff changeset	1265 if (!dtor)
23d0d9855cad [svn r289] Fixed: right shift >> was broken for unsigned types. lindquist parents: 244 diff changeset	1266 return getNullPtr(getVoidPtrType());
23d0d9855cad [svn r289] Fixed: right shift >> was broken for unsigned types. lindquist parents: 244 diff changeset	1267
23d0d9855cad [svn r289] Fixed: right shift >> was broken for unsigned types. lindquist parents: 244 diff changeset	1268 DtoForceDeclareDsymbol(dtor);
23d0d9855cad [svn r289] Fixed: right shift >> was broken for unsigned types. lindquist parents: 244 diff changeset	1269 return llvm::ConstantExpr::getBitCast(dtor->ir.irFunc->func, getPtrToType(LLType::Int8Ty));
112 368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1270 }
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1271
285 297690b5d4a5 [svn r306] Fixed: it's now possible to compile and link llvmdc with MinGW32 and msys on Win32 :D I tried it myself ;) Building the runtime still needs some work, but it's a step in the right direction. lindquist parents: 284 diff changeset	1272 static unsigned build_classinfo_flags(ClassDeclaration* cd)
112 368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1273 {
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1274 // adapted from original dmd code
285 297690b5d4a5 [svn r306] Fixed: it's now possible to compile and link llvmdc with MinGW32 and msys on Win32 :D I tried it myself ;) Building the runtime still needs some work, but it's a step in the right direction. lindquist parents: 284 diff changeset	1275 unsigned flags = 0;
112 368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1276 //flags \|= isCOMclass(); // IUnknown
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1277 bool hasOffTi = false;
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1278 if (cd->ctor) flags \|= 8;
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1279 for (ClassDeclaration *cd2 = cd; cd2; cd2 = cd2->baseClass)
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1280 {
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1281 if (cd2->members)
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1282 {
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1283 for (size_t i = 0; i < cd2->members->dim; i++)
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1284 {
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1285 Dsymbol sm = (Dsymbol )cd2->members->data[i];
275 665b81613475 [svn r296] Removed: the 'suite' dir, it never took off! lindquist parents: 271 diff changeset	1286 if (sm->isVarDeclaration() && !sm->isVarDeclaration()->isDataseg()) // is this enough?
112 368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1287 hasOffTi = true;
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1288 //printf("sm = %s %s\n", sm->kind(), sm->toChars());
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1289 if (sm->hasPointers())
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1290 goto L2;
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1291 }
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1292 }
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1293 }
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1294 flags \|= 2; // no pointers
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1295 L2:
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1296 if (hasOffTi)
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1297 flags \|= 4;
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1298 return flags;
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1299 }
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1300
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1301 void DtoDefineClassInfo(ClassDeclaration* cd)
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1302 {
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1303 // The layout is:
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1304 // {
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1305 // void **vptr;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1306 // monitor_t monitor;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1307 // byte[] initializer; // static initialization data
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1308 // char[] name; // class name
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1309 // void *[] vtbl;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1310 // Interface[] interfaces;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1311 // ClassInfo *base; // base class
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1312 // void *destructor;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1313 // void *invariant; // class invariant
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1314 // uint flags;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1315 // void *deallocator;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1316 // OffsetTypeInfo[] offTi;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1317 // void *defaultConstructor;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1318 // }
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1319
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	1320 if (cd->ir.irStruct->classDefined) return;
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	1321 cd->ir.irStruct->classDefined = true;
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	1322
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	1323 Logger::println("DtoDefineClassInfo(%s)", cd->toChars());
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	1324 LOG_SCOPE;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1325
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	1326 assert(cd->type->ty == Tclass);
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	1327 assert(cd->ir.irStruct->classInfo);
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	1328
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	1329 TypeClass* cdty = (TypeClass*)cd->type;
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1330 if (!cd->isInterfaceDeclaration() && !cd->isAbstract()) {
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	1331 assert(cd->ir.irStruct->init);
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	1332 assert(cd->ir.irStruct->constInit);
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	1333 assert(cd->ir.irStruct->vtbl);
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	1334 assert(cd->ir.irStruct->constVtbl);
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1335 }
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1336
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1337 // holds the list of initializers for llvm
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	1338 std::vector<LLConstant*> inits;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1339
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1340 ClassDeclaration* cinfo = ClassDeclaration::classinfo;
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	1341 DtoForceConstInitDsymbol(cinfo);
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	1342 assert(cinfo->ir.irStruct->constInit);
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1343
284 70c370e97944 [svn r305] Started support for custom class allocators/deallocators. Allocators with more than one argument still need to be fixed. lindquist parents: 275 diff changeset	1344 // def init constant
70c370e97944 [svn r305] Started support for custom class allocators/deallocators. Allocators with more than one argument still need to be fixed. lindquist parents: 275 diff changeset	1345 LLConstant* defc = cinfo->ir.irStruct->constInit;
70c370e97944 [svn r305] Started support for custom class allocators/deallocators. Allocators with more than one argument still need to be fixed. lindquist parents: 275 diff changeset	1346 assert(defc);
70c370e97944 [svn r305] Started support for custom class allocators/deallocators. Allocators with more than one argument still need to be fixed. lindquist parents: 275 diff changeset	1347
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	1348 LLConstant* c;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1349
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1350 // own vtable
284 70c370e97944 [svn r305] Started support for custom class allocators/deallocators. Allocators with more than one argument still need to be fixed. lindquist parents: 275 diff changeset	1351 c = defc->getOperand(0);
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1352 assert(c);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1353 inits.push_back(c);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1354
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1355 // monitor
284 70c370e97944 [svn r305] Started support for custom class allocators/deallocators. Allocators with more than one argument still need to be fixed. lindquist parents: 275 diff changeset	1356 c = defc->getOperand(1);
115 5ba6d286c941 [svn r119] Added the monitor data field that comes after the vtable pointer to all classes. Represented as a void* initialized to zero. lindquist parents: 114 diff changeset	1357 inits.push_back(c);
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1358
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	1359 // byte[] init
244 a95056b3c996 [svn r261] Fixed debug info for integer and floating local variables, can now be inspected in GDB. lindquist parents: 217 diff changeset	1360 const LLType* byteptrty = getPtrToType(LLType::Int8Ty);
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1361 if (cd->isInterfaceDeclaration() \|\| cd->isAbstract()) {
284 70c370e97944 [svn r305] Started support for custom class allocators/deallocators. Allocators with more than one argument still need to be fixed. lindquist parents: 275 diff changeset	1362 c = defc->getOperand(2);
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1363 }
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1364 else {
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	1365 c = llvm::ConstantExpr::getBitCast(cd->ir.irStruct->init, byteptrty);
292 a92ec67eabe7 [svn r313] Fix class initializer size regression introduced in [305]. ChristianK parents: 285 diff changeset	1366 size_t initsz = getABITypeSize(cd->ir.irStruct->constInit->getType());
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1367 c = DtoConstSlice(DtoConstSize_t(initsz), c);
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1368 }
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1369 inits.push_back(c);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1370
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1371 // class name
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1372 // from dmd
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1373 char *name = cd->ident->toChars();
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1374 size_t namelen = strlen(name);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1375 if (!(namelen > 9 && memcmp(name, "TypeInfo_", 9) == 0))
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1376 {
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1377 name = cd->toPrettyChars();
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1378 namelen = strlen(name);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1379 }
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1380 c = DtoConstString(name);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1381 inits.push_back(c);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1382
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1383 // vtbl array
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1384 if (cd->isInterfaceDeclaration() \|\| cd->isAbstract()) {
284 70c370e97944 [svn r305] Started support for custom class allocators/deallocators. Allocators with more than one argument still need to be fixed. lindquist parents: 275 diff changeset	1385 c = defc->getOperand(4);
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1386 }
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1387 else {
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	1388 const LLType* byteptrptrty = getPtrToType(byteptrty);
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	1389 assert(!cd->ir.irStruct->vtbl->getType()->isAbstract());
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	1390 c = llvm::ConstantExpr::getBitCast(cd->ir.irStruct->vtbl, byteptrptrty);
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	1391 assert(!cd->ir.irStruct->constVtbl->getType()->isAbstract());
199 ba47ac346ddd [svn r215] fix for empty class vtbl ChristianK parents: 193 diff changeset	1392 size_t vtblsz = 0;
ba47ac346ddd [svn r215] fix for empty class vtbl ChristianK parents: 193 diff changeset	1393 llvm::ConstantArray* constVtblArray = llvm::dyn_cast<llvm::ConstantArray>(cd->ir.irStruct->constVtbl);
ba47ac346ddd [svn r215] fix for empty class vtbl ChristianK parents: 193 diff changeset	1394 if(constVtblArray) {
ba47ac346ddd [svn r215] fix for empty class vtbl ChristianK parents: 193 diff changeset	1395 vtblsz = constVtblArray->getType()->getNumElements();
ba47ac346ddd [svn r215] fix for empty class vtbl ChristianK parents: 193 diff changeset	1396 }
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1397 c = DtoConstSlice(DtoConstSize_t(vtblsz), c);
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1398 }
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1399 inits.push_back(c);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1400
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1401 // interfaces array
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	1402 IrStruct* irstruct = cd->ir.irStruct;
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1403 if (cd->isInterfaceDeclaration() \|\| !irstruct->interfaceInfos \|\| cd->isAbstract()) {
284 70c370e97944 [svn r305] Started support for custom class allocators/deallocators. Allocators with more than one argument still need to be fixed. lindquist parents: 275 diff changeset	1404 c = defc->getOperand(5);
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1405 }
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1406 else {
284 70c370e97944 [svn r305] Started support for custom class allocators/deallocators. Allocators with more than one argument still need to be fixed. lindquist parents: 275 diff changeset	1407 const LLType* t = defc->getOperand(5)->getType()->getContainedType(1);
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1408 c = llvm::ConstantExpr::getBitCast(irstruct->interfaceInfos, t);
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1409 size_t iisz = irstruct->interfaceInfosTy->getNumElements();
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1410 c = DtoConstSlice(DtoConstSize_t(iisz), c);
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1411 }
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1412 inits.push_back(c);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1413
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1414 // base classinfo
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1415 if (cd->baseClass && !cd->isInterfaceDeclaration() && !cd->isAbstract()) {
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	1416 DtoDeclareClassInfo(cd->baseClass);
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	1417 c = cd->baseClass->ir.irStruct->classInfo;
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	1418 assert(c);
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	1419 inits.push_back(c);
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	1420 }
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	1421 else {
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	1422 // null
284 70c370e97944 [svn r305] Started support for custom class allocators/deallocators. Allocators with more than one argument still need to be fixed. lindquist parents: 275 diff changeset	1423 c = defc->getOperand(6);
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	1424 inits.push_back(c);
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	1425 }
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1426
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1427 // destructor
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1428 if (cd->isInterfaceDeclaration() \|\| cd->isAbstract()) {
284 70c370e97944 [svn r305] Started support for custom class allocators/deallocators. Allocators with more than one argument still need to be fixed. lindquist parents: 275 diff changeset	1429 c = defc->getOperand(7);
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1430 }
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1431 else {
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1432 c = build_class_dtor(cd);
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1433 }
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1434 inits.push_back(c);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1435
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1436 // invariant
327 781af50846b2 [svn r348] Switch on class invariants (except in release mode). ChristianK parents: 315 diff changeset	1437 if (cd->inv) {
781af50846b2 [svn r348] Switch on class invariants (except in release mode). ChristianK parents: 315 diff changeset	1438 DtoForceDeclareDsymbol(cd->inv);
781af50846b2 [svn r348] Switch on class invariants (except in release mode). ChristianK parents: 315 diff changeset	1439 c = cd->inv->ir.irFunc->func;
328 7086a84ab3d6 [svn r349] Fixed problems with static arrays of void as well as a static arrays with zero length. lindquist parents: 327 diff changeset	1440 c = llvm::ConstantExpr::getBitCast(c, defc->getOperand(8)->getType());
327 781af50846b2 [svn r348] Switch on class invariants (except in release mode). ChristianK parents: 315 diff changeset	1441 }
781af50846b2 [svn r348] Switch on class invariants (except in release mode). ChristianK parents: 315 diff changeset	1442 else {
781af50846b2 [svn r348] Switch on class invariants (except in release mode). ChristianK parents: 315 diff changeset	1443 c = defc->getOperand(8);
781af50846b2 [svn r348] Switch on class invariants (except in release mode). ChristianK parents: 315 diff changeset	1444 }
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1445 inits.push_back(c);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1446
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1447 // uint flags
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1448 if (cd->isInterfaceDeclaration() \|\| cd->isAbstract()) {
284 70c370e97944 [svn r305] Started support for custom class allocators/deallocators. Allocators with more than one argument still need to be fixed. lindquist parents: 275 diff changeset	1449 c = defc->getOperand(9);
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1450 }
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1451 else {
285 297690b5d4a5 [svn r306] Fixed: it's now possible to compile and link llvmdc with MinGW32 and msys on Win32 :D I tried it myself ;) Building the runtime still needs some work, but it's a step in the right direction. lindquist parents: 284 diff changeset	1452 unsigned flags = build_classinfo_flags(cd);
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1453 c = DtoConstUint(flags);
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1454 }
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1455 inits.push_back(c);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1456
284 70c370e97944 [svn r305] Started support for custom class allocators/deallocators. Allocators with more than one argument still need to be fixed. lindquist parents: 275 diff changeset	1457 // deallocator
70c370e97944 [svn r305] Started support for custom class allocators/deallocators. Allocators with more than one argument still need to be fixed. lindquist parents: 275 diff changeset	1458 if (cd->aggDelete) {
70c370e97944 [svn r305] Started support for custom class allocators/deallocators. Allocators with more than one argument still need to be fixed. lindquist parents: 275 diff changeset	1459 DtoForceDeclareDsymbol(cd->aggDelete);
70c370e97944 [svn r305] Started support for custom class allocators/deallocators. Allocators with more than one argument still need to be fixed. lindquist parents: 275 diff changeset	1460 c = cd->aggDelete->ir.irFunc->func;
70c370e97944 [svn r305] Started support for custom class allocators/deallocators. Allocators with more than one argument still need to be fixed. lindquist parents: 275 diff changeset	1461 c = llvm::ConstantExpr::getBitCast(c, defc->getOperand(10)->getType());
70c370e97944 [svn r305] Started support for custom class allocators/deallocators. Allocators with more than one argument still need to be fixed. lindquist parents: 275 diff changeset	1462 }
70c370e97944 [svn r305] Started support for custom class allocators/deallocators. Allocators with more than one argument still need to be fixed. lindquist parents: 275 diff changeset	1463 else {
70c370e97944 [svn r305] Started support for custom class allocators/deallocators. Allocators with more than one argument still need to be fixed. lindquist parents: 275 diff changeset	1464 c = defc->getOperand(10);
70c370e97944 [svn r305] Started support for custom class allocators/deallocators. Allocators with more than one argument still need to be fixed. lindquist parents: 275 diff changeset	1465 }
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1466 inits.push_back(c);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1467
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1468 // offset typeinfo
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1469 if (cd->isInterfaceDeclaration() \|\| cd->isAbstract()) {
284 70c370e97944 [svn r305] Started support for custom class allocators/deallocators. Allocators with more than one argument still need to be fixed. lindquist parents: 275 diff changeset	1470 c = defc->getOperand(11);
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1471 }
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1472 else {
284 70c370e97944 [svn r305] Started support for custom class allocators/deallocators. Allocators with more than one argument still need to be fixed. lindquist parents: 275 diff changeset	1473 c = build_offti_array(cd, defc->getOperand(11));
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1474 }
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1475 inits.push_back(c);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1476
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1477 // default constructor
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1478 if (cd->defaultCtor && !cd->isInterfaceDeclaration() && !cd->isAbstract()) {
111 a7ae554ce4f4 [svn r115] Implemented the ClassInfo.defaultConstructor member. lindquist parents: 110 diff changeset	1479 DtoForceDeclareDsymbol(cd->defaultCtor);
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	1480 c = isaConstant(cd->defaultCtor->ir.irFunc->func);
284 70c370e97944 [svn r305] Started support for custom class allocators/deallocators. Allocators with more than one argument still need to be fixed. lindquist parents: 275 diff changeset	1481 const LLType* toTy = defc->getOperand(12)->getType();
117 56a21f3e5d3e [svn r121] Finished ModuleInfo implementation. lindquist parents: 115 diff changeset	1482 c = llvm::ConstantExpr::getBitCast(c, toTy);
111 a7ae554ce4f4 [svn r115] Implemented the ClassInfo.defaultConstructor member. lindquist parents: 110 diff changeset	1483 }
a7ae554ce4f4 [svn r115] Implemented the ClassInfo.defaultConstructor member. lindquist parents: 110 diff changeset	1484 else {
284 70c370e97944 [svn r305] Started support for custom class allocators/deallocators. Allocators with more than one argument still need to be fixed. lindquist parents: 275 diff changeset	1485 c = defc->getOperand(12);
111 a7ae554ce4f4 [svn r115] Implemented the ClassInfo.defaultConstructor member. lindquist parents: 110 diff changeset	1486 }
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1487 inits.push_back(c);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1488
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1489 /*size_t n = inits.size();
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1490 for (size_t i=0; i<n; ++i)
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1491 {
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1492 Logger::cout() << "inits[" << i << "]: " << *inits[i] << '\n';
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1493 }*/
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1494
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1495 // build the initializer
284 70c370e97944 [svn r305] Started support for custom class allocators/deallocators. Allocators with more than one argument still need to be fixed. lindquist parents: 275 diff changeset	1496 const llvm::StructType* st = isaStruct(defc->getType());
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	1497 LLConstant* finalinit = llvm::ConstantStruct::get(st, inits);
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1498 //Logger::cout() << "built the classinfo initializer:\n" << *finalinit <<'\n';
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1499
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	1500 cd->ir.irStruct->constClassInfo = finalinit;
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	1501 cd->ir.irStruct->classInfo->setInitializer(finalinit);
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1502 }

Mercurial > projects > ldc

annotate gen/classes.cpp @ 705:5a2983f97498