projects/ldc: gen/classes.cpp annotate

annotate gen/classes.cpp @ 1047:6bb04dbee21f

Some calling convention work for x86-64: - Implement x86-64 extern(C), hopefully correctly. - Tried to be a bit smarter about extern(D) while I was there. Interestingly, this code seems to be generating more efficient code than gcc and llvm-gcc in some edge cases, like returning a `{ [7 x i8] }` loaded from a stack slot from an extern(C) function. (gcc generates 7 1-byte loads, while this code generates a 4-byte, a 2-byte and a 1-byte load) I also added some changes to make sure structs being returned from functions or passed in as parameters are stored in memory where the rest of the backend seems to expect them to be. These should be removed when support for first-class aggregates improves.

author	Frits van Bommel <fvbommel wxs.nl>
date	Fri, 06 Mar 2009 16:00:47 +0100
parents	8c73ff5f69e0
children	83ef1e7cde70

rev	line source
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1 #include "gen/llvm.h"
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	2
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	3 #include "mtype.h"
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	4 #include "aggregate.h"
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	5 #include "init.h"
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	6 #include "declaration.h"
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	7
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	8 #include "gen/irstate.h"
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	9 #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	10 #include "gen/llvmhelpers.h"
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	11 #include "gen/arrays.h"
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	12 #include "gen/logger.h"
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	13 #include "gen/classes.h"
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	14 #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	15 #include "gen/functions.h"
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	16 #include "gen/runtime.h"
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	17 #include "gen/dvalue.h"
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	18
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	19 #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	20
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	21 //////////////////////////////////////////////////////////////////////////////////////////
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	22
833 482cd74d1c71 Add all base interfaces to interfaceMap, not just direct parents. Christian Kamm <kamm incasoftware de> parents: 825 diff changeset	23 // adds the base interfaces of b and the given iri to IrStruct's interfaceMap
835 3afe9f276db7 Added back a bunch of static's to gen/classes.cpp, it's not superfluous, it makes the functions internal to the compilation unit, and we don't call them anywhere else. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 833 diff changeset	24 static void add_base_interfaces(IrStruct* to, IrInterface* iri, BaseClass* b)
833 482cd74d1c71 Add all base interfaces to interfaceMap, not just direct parents. Christian Kamm <kamm incasoftware de> parents: 825 diff changeset	25 {
482cd74d1c71 Add all base interfaces to interfaceMap, not just direct parents. Christian Kamm <kamm incasoftware de> parents: 825 diff changeset	26 for (unsigned j = 0; j < b->baseInterfaces_dim; j++)
482cd74d1c71 Add all base interfaces to interfaceMap, not just direct parents. Christian Kamm <kamm incasoftware de> parents: 825 diff changeset	27 {
482cd74d1c71 Add all base interfaces to interfaceMap, not just direct parents. Christian Kamm <kamm incasoftware de> parents: 825 diff changeset	28 BaseClass *bc = &b->baseInterfaces[j];
482cd74d1c71 Add all base interfaces to interfaceMap, not just direct parents. Christian Kamm <kamm incasoftware de> parents: 825 diff changeset	29 // add to map
482cd74d1c71 Add all base interfaces to interfaceMap, not just direct parents. Christian Kamm <kamm incasoftware de> parents: 825 diff changeset	30 if (to->interfaceMap.find(bc->base) == to->interfaceMap.end())
482cd74d1c71 Add all base interfaces to interfaceMap, not just direct parents. Christian Kamm <kamm incasoftware de> parents: 825 diff changeset	31 {
482cd74d1c71 Add all base interfaces to interfaceMap, not just direct parents. Christian Kamm <kamm incasoftware de> parents: 825 diff changeset	32 to->interfaceMap.insert(std::make_pair(bc->base, iri));
482cd74d1c71 Add all base interfaces to interfaceMap, not just direct parents. Christian Kamm <kamm incasoftware de> parents: 825 diff changeset	33 }
482cd74d1c71 Add all base interfaces to interfaceMap, not just direct parents. Christian Kamm <kamm incasoftware de> parents: 825 diff changeset	34 // add base interfaces
482cd74d1c71 Add all base interfaces to interfaceMap, not just direct parents. Christian Kamm <kamm incasoftware de> parents: 825 diff changeset	35 add_base_interfaces(to, iri, bc);
482cd74d1c71 Add all base interfaces to interfaceMap, not just direct parents. Christian Kamm <kamm incasoftware de> parents: 825 diff changeset	36 }
482cd74d1c71 Add all base interfaces to interfaceMap, not just direct parents. Christian Kamm <kamm incasoftware de> parents: 825 diff changeset	37 }
482cd74d1c71 Add all base interfaces to interfaceMap, not just direct parents. Christian Kamm <kamm incasoftware de> parents: 825 diff changeset	38
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	39 // adds interface b to target, if newinstance != 0, then target must provide all
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	40 // functions required to implement b (it reimplements b)
835 3afe9f276db7 Added back a bunch of static's to gen/classes.cpp, it's not superfluous, it makes the functions internal to the compilation unit, and we don't call them anywhere else. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 833 diff changeset	41 static void add_interface(ClassDeclaration* target, BaseClass* b, int newinstance)
137 ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	42 {
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	43 Logger::println("adding interface: %s", b->base->toChars());
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	44 LOG_SCOPE;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	45
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	46 InterfaceDeclaration* inter = b->base->isInterfaceDeclaration();
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	47 DtoResolveClass(inter);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	48
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	49 assert(inter);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	50 IrStruct* irstruct = target->ir.irStruct;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	51 assert(irstruct);
137 ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	52
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	53 // add interface to map/list
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	54 // if it's already inserted in the map, it's because another interface has it as baseclass
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	55 // but if it appears here, it's because we're reimplementing it, so we overwrite the IrInterface entry
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	56 IrInterface* iri;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	57 bool overwrite = false;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	58 if (irstruct->interfaceMap.find(inter) != irstruct->interfaceMap.end())
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	59 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	60 overwrite = true;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	61 }
142 a123dca8349b [svn r146] fixed some potential problems with mismatch in order of interfaces in class data layout lindquist parents: 138 diff changeset	62
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	63 iri = new IrInterface(b);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	64 // add to map
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	65 if (overwrite)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	66 irstruct->interfaceMap[b->base] = iri;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	67 else
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	68 irstruct->interfaceMap.insert(std::make_pair(b->base, iri));
816 7d16ce7ad19d Made ClassInfo.interfaces generation consistent with DMD, fixes #134 Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 812 diff changeset	69
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	70 // add to ordered list
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	71 irstruct->interfaceVec.push_back(iri);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	72
816 7d16ce7ad19d Made ClassInfo.interfaces generation consistent with DMD, fixes #134 Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 812 diff changeset	73 // add to classinfo interfaces
7d16ce7ad19d Made ClassInfo.interfaces generation consistent with DMD, fixes #134 Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 812 diff changeset	74 if (newinstance)
7d16ce7ad19d Made ClassInfo.interfaces generation consistent with DMD, fixes #134 Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 812 diff changeset	75 irstruct->classInfoInterfaces.push_back(iri);
7d16ce7ad19d Made ClassInfo.interfaces generation consistent with DMD, fixes #134 Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 812 diff changeset	76
833 482cd74d1c71 Add all base interfaces to interfaceMap, not just direct parents. Christian Kamm <kamm incasoftware de> parents: 825 diff changeset	77 // recursively assign this iri to all base interfaces
482cd74d1c71 Add all base interfaces to interfaceMap, not just direct parents. Christian Kamm <kamm incasoftware de> parents: 825 diff changeset	78 add_base_interfaces(irstruct, iri, b);
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	79
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	80 // build the interface vtable
806 96b404ba7eb0 Move storage of final vtbl from BaseClass to IrInterface: BaseClass instances are shared! Christian Kamm <kamm incasoftware de> parents: 805 diff changeset	81 b->fillVtbl(target, &iri->vtblDecls, newinstance);
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	82
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	83 // add the vtable type
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	84 assert(inter->type->ir.type);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	85 irstruct->types.push_back( inter->type->ir.type->get() );
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	86 // set and increment index
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	87 iri->index = irstruct->index++;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	88 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	89
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	90 //////////////////////////////////////////////////////////////////////////////////////////
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	91
835 3afe9f276db7 Added back a bunch of static's to gen/classes.cpp, it's not superfluous, it makes the functions internal to the compilation unit, and we don't call them anywhere else. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 833 diff changeset	92 static void add_class_data(ClassDeclaration* target, ClassDeclaration* cd)
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	93 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	94 Logger::println("Adding data from class: %s", cd->toChars());
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	95 LOG_SCOPE;
142 a123dca8349b [svn r146] fixed some potential problems with mismatch in order of interfaces in class data layout lindquist parents: 138 diff changeset	96
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	97 // recurse into baseClasses
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	98 if (cd->baseClass)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	99 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	100 add_class_data(target, cd->baseClass);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	101 //offset = baseClass->structsize;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	102 }
142 a123dca8349b [svn r146] fixed some potential problems with mismatch in order of interfaces in class data layout lindquist parents: 138 diff changeset	103
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	104 // add members
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	105 Array* arr = cd->members;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	106 for (int k=0; k < arr->dim; k++) {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	107 Dsymbol* s = (Dsymbol*)arr->data[k];
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	108 s->toObjFile(0);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	109 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	110
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	111 // add interfaces
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	112 if (cd->vtblInterfaces)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	113 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	114 Logger::println("num vtbl interfaces: %u", cd->vtblInterfaces->dim);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	115 for (int i = 0; i < cd->vtblInterfaces->dim; i++)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	116 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	117 BaseClass b = (BaseClass )cd->vtblInterfaces->data[i];
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	118 assert(b);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	119 // create new instances only for explicitly derived interfaces
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	120 add_interface(target, b, (cd == target));
137 ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	121 }
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	122 }
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	123 }
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	124
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	125 //////////////////////////////////////////////////////////////////////////////////////////
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	126
835 3afe9f276db7 Added back a bunch of static's to gen/classes.cpp, it's not superfluous, it makes the functions internal to the compilation unit, and we don't call them anywhere else. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 833 diff changeset	127 static void DtoResolveInterface(InterfaceDeclaration* cd)
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	128 {
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	129 if (cd->ir.resolved) return;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	130 cd->ir.resolved = true;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	131
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	132 Logger::println("DtoResolveInterface(%s): %s", cd->toPrettyChars(), cd->loc.toChars());
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	133 LOG_SCOPE;
137 ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	134
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	135 // get the TypeClass
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	136 assert(cd->type->ty == Tclass);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	137 TypeClass* ts = (TypeClass*)cd->type;
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	138
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	139 // create the IrStruct, we need somewhere to store the classInfo
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	140 assert(!cd->ir.irStruct);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	141 IrStruct* irstruct = new IrStruct(cd);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	142 cd->ir.irStruct = irstruct;
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	143
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	144 // handle base interfaces
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	145 if (cd->baseclasses.dim)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	146 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	147 Logger::println("num baseclasses: %u", cd->baseclasses.dim);
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	148 LOG_SCOPE;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	149
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	150 for (int i=0; i<cd->baseclasses.dim; i++)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	151 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	152 BaseClass* bc = (BaseClass*)cd->baseclasses.data[i];
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	153 Logger::println("baseclass %d: %s", i, bc->base->toChars());
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	154
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	155 InterfaceDeclaration* id = bc->base->isInterfaceDeclaration();
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	156 assert(id);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	157
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	158 DtoResolveInterface(id);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	159
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	160 // add to interfaceInfos
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	161 IrInterface* iri = new IrInterface(bc);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	162 irstruct->interfaceVec.push_back(iri);
816 7d16ce7ad19d Made ClassInfo.interfaces generation consistent with DMD, fixes #134 Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 812 diff changeset	163 irstruct->classInfoInterfaces.push_back(iri);
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	164 }
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	165 }
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	166
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	167 // create the type
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	168 const LLType* t = LLArrayType::get(getVoidPtrType(), cd->vtbl.dim);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	169 assert(!ts->ir.type);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	170 ts->ir.type = new LLPATypeHolder(getPtrToType(t));
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	171
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	172 // request declaration
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	173 gIR->declareList.push_back(cd);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	174
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	175 // handle members
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	176 // like "nested" interfaces
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	177 Array* arr = cd->members;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	178 for (int k=0; k < arr->dim; k++) {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	179 Dsymbol* s = (Dsymbol*)arr->data[k];
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	180 s->toObjFile(0);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	181 }
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	182 }
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	183
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	184 //////////////////////////////////////////////////////////////////////////////////////////
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	185
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	186 // FIXME: this needs to be cleaned up
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	187
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	188 void DtoResolveClass(ClassDeclaration* cd)
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	189 {
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	190 if (InterfaceDeclaration* id = cd->isInterfaceDeclaration())
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	191 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	192 DtoResolveInterface(id);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	193 return;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	194 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	195
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	196 if (cd->ir.resolved) return;
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	197 cd->ir.resolved = true;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	198
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	199 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	200 LOG_SCOPE;
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	201
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	202 //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	203
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	204 // get the TypeClass
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	205 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	206 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	207
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	208 // create the IrStruct
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	209 assert(!cd->ir.irStruct);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	210 IrStruct* irstruct = new IrStruct(cd);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	211 cd->ir.irStruct = irstruct;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	212
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	213 // create the type
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	214 ts->ir.type = new LLPATypeHolder(llvm::OpaqueType::get());
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	215
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	216 // if it just a forward declaration?
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	217 if (cd->sizeok != 1)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	218 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	219 // just name the type
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	220 gIR->module->addTypeName(cd->mangle(), ts->ir.type->get());
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	221 return;
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	222 }
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	223
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	224 // 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	225 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	226 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	227 }
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	228
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	229 // push state
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	230 gIR->structs.push_back(irstruct);
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	231
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	232 // add vtable
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	233 irstruct->types.push_back(getPtrToType(irstruct->vtblTy.get()));
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	234 irstruct->index++;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	235
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	236 // add monitor
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	237 irstruct->types.push_back(getVoidPtrType());
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	238 irstruct->index++;
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	239
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	240 // add class data fields and interface vtables recursively
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	241 add_class_data(cd, cd);
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	242
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	243 // check if errors occured while building interface vtables
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	244 if (global.errors)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	245 fatal();
137 ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	246
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	247 // create type
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	248 assert(irstruct->index == irstruct->types.size());
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	249 const LLType* structtype = irstruct->build();
137 ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	250
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	251 // refine abstract types for stuff like: class C {C next;}
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	252 llvm::PATypeHolder* spa = ts->ir.type;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	253 llvm::cast<llvm::OpaqueType>(spa->get())->refineAbstractTypeTo(structtype);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	254 structtype = isaStruct(spa->get());
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	255
123 7f9a0a58394b [svn r127] Updated the lphobos build scripts a little. Created a new rebuild profile. lindquist parents: 121 diff changeset	256 // name the type
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	257 gIR->module->addTypeName(cd->mangle(), ts->ir.type->get());
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	258
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	259 // refine vtable type
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	260
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	261 // void*[vtbl.dim]
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	262 llvm::cast<llvm::OpaqueType>(irstruct->vtblTy.get())->refineAbstractTypeTo(LLArrayType::get(getVoidPtrType(), cd->vtbl.dim));
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	263
aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	264 // log
825 a70ddd449e7d Commented some logging that could be '''very''' long, cuts -vv output size of a gtkd gl sample down 1.2GB by 3/4. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 821 diff changeset	265 // if (Logger::enabled())
a70ddd449e7d Commented some logging that could be '''very''' long, cuts -vv output size of a gtkd gl sample down 1.2GB by 3/4. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 821 diff changeset	266 // 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	267
aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	268 // 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	269 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	270
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	271 // 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	272 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	273 }
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	274
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	275 //////////////////////////////////////////////////////////////////////////////////////////
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	276
835 3afe9f276db7 Added back a bunch of static's to gen/classes.cpp, it's not superfluous, it makes the functions internal to the compilation unit, and we don't call them anywhere else. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 833 diff changeset	277 static void DtoDeclareInterface(InterfaceDeclaration* cd)
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	278 {
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	279 if (cd->ir.declared) return;
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	280 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	281
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	282 Logger::println("DtoDeclareInterface(%s): %s", cd->toPrettyChars(), cd->locToChars());
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	283 LOG_SCOPE;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	284
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	285 assert(cd->ir.irStruct);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	286 IrStruct* irstruct = cd->ir.irStruct;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	287
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	288 // get interface info type
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	289 const llvm::StructType* infoTy = DtoInterfaceInfoType();
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	290
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	291 // interface info array
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	292 if (!irstruct->interfaceVec.empty()) {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	293 // symbol name
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	294 std::string nam = "_D";
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	295 nam.append(cd->mangle());
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	296 nam.append("16__interfaceInfosZ");
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	297
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	298 llvm::GlobalValue::LinkageTypes linkage = DtoLinkage(cd);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	299
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	300 // resolve array type
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	301 const llvm::ArrayType* arrTy = llvm::ArrayType::get(infoTy, irstruct->interfaceVec.size());
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	302 // declare global
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	303 irstruct->interfaceInfos = new llvm::GlobalVariable(arrTy, true, linkage, NULL, nam, gIR->module);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	304
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	305 // do each interface info
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	306 unsigned idx = 0;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	307 size_t n = irstruct->interfaceVec.size();
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	308 for (size_t i=0; i < n; i++)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	309 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	310 IrInterface* iri = irstruct->interfaceVec[i];
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	311 ClassDeclaration* id = iri->decl;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	312
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	313 // always create interfaceinfos
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	314 LLConstant* idxs[2] = {DtoConstUint(0), DtoConstUint(idx)};
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	315 iri->info = llvm::ConstantExpr::getGetElementPtr(irstruct->interfaceInfos, idxs, 2);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	316 idx++;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	317 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	318 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	319
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	320 // declare the classinfo
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	321 DtoDeclareClassInfo(cd);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	322
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	323 // request const init
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	324 gIR->constInitList.push_back(cd);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	325
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	326 // emit typeinfo and request definition
940 39519a1ff603 Changed the way LDC determines if a template instantiation needs to get a definition, seems to speed up compile times quite a bit in some cases. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 920 diff changeset	327 if (mustDefineSymbol(cd))
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	328 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	329 gIR->defineList.push_back(cd);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	330 DtoTypeInfoOf(cd->type, false);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	331 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	332 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	333
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	334 //////////////////////////////////////////////////////////////////////////////////////////
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	335
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	336 // FIXME: this needs to be cleaned up
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	337
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	338 void DtoDeclareClass(ClassDeclaration* cd)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	339 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	340 if (InterfaceDeclaration* id = cd->isInterfaceDeclaration())
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	341 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	342 DtoDeclareInterface(id);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	343 return;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	344 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	345
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	346 if (cd->ir.declared) return;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	347 cd->ir.declared = true;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	348
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	349 Logger::println("DtoDeclareClass(%s): %s", cd->toPrettyChars(), cd->locToChars());
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 LOG_SCOPE;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	351
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	352 //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	353
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	354 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	355 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	356
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	357 assert(cd->ir.irStruct);
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	358 IrStruct* irstruct = cd->ir.irStruct;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	359
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	360 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	361
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	362 bool needs_definition = false;
940 39519a1ff603 Changed the way LDC determines if a template instantiation needs to get a definition, seems to speed up compile times quite a bit in some cases. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 920 diff changeset	363 if (mustDefineSymbol(cd)) {
123 7f9a0a58394b [svn r127] Updated the lphobos build scripts a little. Created a new rebuild profile. lindquist parents: 121 diff changeset	364 needs_definition = true;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	365 }
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	366
149 4c577c2b7229 [svn r155] Fixed a bunch of linkage problems (especially with templates) lindquist parents: 147 diff changeset	367 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	368
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	369 // create vtbl symbol
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	370 std::string varname("_D");
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	371 varname.append(cd->mangle());
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	372 varname.append("6__vtblZ");
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	373 irstruct->vtbl = new llvm::GlobalVariable(irstruct->vtblInitTy.get(), true, _linkage, 0, varname, gIR->module);
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	374
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	375 // 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	376 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	377
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	378 // interface info array
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	379 if (!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	380 // 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	381 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	382 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	383 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	384 // resolve array type
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	385 const llvm::ArrayType* arrTy = llvm::ArrayType::get(infoTy, 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	386 // 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	387 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	388 }
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	389
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	390 // DMD gives abstract classes a full ClassInfo, so we do it as well
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	391
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	392 // interface vtables
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	393 unsigned idx = 0;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	394 for (IrStruct::InterfaceVectorIter i=irstruct->interfaceVec.begin(); i!=irstruct->interfaceVec.end(); ++i)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	395 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	396 IrInterface* iri = *i;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	397 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	398
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	399 std::string nam("_D");
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	400 nam.append(cd->mangle());
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	401 nam.append("11__interface");
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	402 nam.append(id->mangle());
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	403 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	404
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	405 iri->vtbl = new llvm::GlobalVariable(iri->vtblInitTy.get(), true, _linkage, 0, nam, gIR->module);
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	406
816 7d16ce7ad19d Made ClassInfo.interfaces generation consistent with DMD, fixes #134 Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 812 diff changeset	407 // always set the interface info as it's need as the first vtbl entry
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	408 LLConstant* idxs[2] = {DtoConstUint(0), DtoConstUint(idx)};
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	409 iri->info = llvm::ConstantExpr::getGetElementPtr(irstruct->interfaceInfos, idxs, 2);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	410 idx++;
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	411 }
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	412
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	413 // initZ init
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	414 std::string initname("_D");
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	415 initname.append(cd->mangle());
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	416 initname.append("6__initZ");
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	417
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	418 // initZ global
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	419 llvm::GlobalVariable* initvar = new llvm::GlobalVariable(irstruct->initOpaque.get(), true, _linkage, NULL, initname, gIR->module);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	420 irstruct->init = initvar;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	421
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	422 gIR->structs.pop_back();
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	423
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	424 // request const init
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	425 gIR->constInitList.push_back(cd);
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	426
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	427 // define ? (set initializers)
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	428 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	429 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	430
855adfdb8d38 [svn r107] Getting .classinfo on a class instance now works (classinfo is stored in vtable) lindquist parents: 102 diff changeset	431 // classinfo
855adfdb8d38 [svn r107] Getting .classinfo on a class instance now works (classinfo is stored in vtable) lindquist parents: 102 diff changeset	432 DtoDeclareClassInfo(cd);
106 5b5194b25f33 [svn r110] Fixed typeinfo for classes. lindquist parents: 103 diff changeset	433
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	434 // do typeinfo ?
123 7f9a0a58394b [svn r127] Updated the lphobos build scripts a little. Created a new rebuild profile. lindquist parents: 121 diff changeset	435 if (needs_definition)
275 665b81613475 [svn r296] Removed: the 'suite' dir, it never took off! lindquist parents: 271 diff changeset	436 DtoTypeInfoOf(cd->type, false);
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	437 }
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	438
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	439 //////////////////////////////////////////////////////////////////////////////
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	440
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	441 // adds data fields and interface vtables to the constant initializer of class cd
835 3afe9f276db7 Added back a bunch of static's to gen/classes.cpp, it's not superfluous, it makes the functions internal to the compilation unit, and we don't call them anywhere else. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 833 diff changeset	442 static size_t init_class_initializer(std::vector<LLConstant>& inits, ClassDeclaration target, ClassDeclaration* cd, size_t offsetbegin)
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	443 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	444 // first do baseclasses
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	445 if (cd->baseClass)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	446 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	447 offsetbegin = init_class_initializer(inits, target, cd->baseClass, offsetbegin);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	448 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	449
812 6c2ff06c4201 Fixed a nasty bug with how interface vtables for class initializers were output, causing some class fields to be skipped. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 809 diff changeset	450 Logger::println("adding data of %s to %s starting at %lu", cd->toChars(), target->toChars(), offsetbegin);
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	451 LOG_SCOPE;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	452
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	453 // add default fields
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	454 VarDeclaration fields = (VarDeclaration)cd->fields.data;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	455 size_t nfields = cd->fields.dim;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	456
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	457 std::vector<VarDeclaration*> defVars;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	458 defVars.reserve(nfields);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	459
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	460 size_t lastoffset = offsetbegin;
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	461 size_t lastsize = 0;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	462
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	463 // find fields that contribute to default
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	464 for (size_t i=0; i<nfields; i++)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	465 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	466 VarDeclaration* var = fields[i];
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	467 // only add vars that don't overlap
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	468 size_t offset = var->offset;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	469 size_t size = var->type->size();
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	470 if (offset >= lastoffset+lastsize)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	471 {
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	472 Logger::println(" added %s", var->toChars());
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	473 lastoffset = offset;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	474 lastsize = size;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	475 defVars.push_back(var);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	476 }
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	477 else
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	478 {
812 6c2ff06c4201 Fixed a nasty bug with how interface vtables for class initializers were output, causing some class fields to be skipped. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 809 diff changeset	479 Logger::println(" skipped %s at offset %u, current pos is %lu", var->toChars(), var->offset, lastoffset+lastsize);
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	480 }
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	481 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	482
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	483 // reset offsets, we're going from beginning again
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	484 lastoffset = offsetbegin;
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	485 lastsize = 0;
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	486
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	487 // go through the default vars and build the default constant initializer
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	488 // adding zeros along the way to live up to alignment expectations
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	489 size_t nvars = defVars.size();
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	490 for (size_t i=0; i<nvars; i++)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	491 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	492 VarDeclaration* var = defVars[i];
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	493
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	494 Logger::println("field %s %s = %s : +%u", var->type->toChars(), var->toChars(), var->init ? var->init->toChars() : var->type->defaultInit(var->loc)->toChars(), var->offset);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	495
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	496 // get offset and size
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	497 size_t offset = var->offset;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	498 size_t size = var->type->size();
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	499
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	500 // is there space in between last last offset and this one?
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	501 // if so, fill it with zeros
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	502 if (offset > lastoffset+lastsize)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	503 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	504 size_t pos = lastoffset + lastsize;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	505 addZeros(inits, pos, offset);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	506 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	507
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	508 // add the field
800 d14e4594c7d7 Changed aggregate field initializers to be created lazily, fixes problem with static void arrays in aggregates. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 797 diff changeset	509 // and build its constant initializer lazily
d14e4594c7d7 Changed aggregate field initializers to be created lazily, fixes problem with static void arrays in aggregates. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 797 diff changeset	510 if (!var->ir.irField->constInit)
803 c62c6936635b Removed DtoConstFieldInitializer, it's no longer needed and was buggy. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 802 diff changeset	511 var->ir.irField->constInit = DtoConstInitializer(var->loc, var->type, var->init);
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	512 inits.push_back(var->ir.irField->constInit);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	513
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	514 lastoffset = offset;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	515 lastsize = var->type->size();
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	516 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	517
806 96b404ba7eb0 Move storage of final vtbl from BaseClass to IrInterface: BaseClass instances are shared! Christian Kamm <kamm incasoftware de> parents: 805 diff changeset	518 // if it's a class, and it implements interfaces, add the vtables - as found in the target class!
96b404ba7eb0 Move storage of final vtbl from BaseClass to IrInterface: BaseClass instances are shared! Christian Kamm <kamm incasoftware de> parents: 805 diff changeset	519 IrStruct* irstruct = target->ir.irStruct;
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	520
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	521 size_t nvtbls = cd->vtblInterfaces->dim;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	522 for(size_t i=0; i<nvtbls; i++)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	523 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	524 BaseClass* bc = (BaseClass*)cd->vtblInterfaces->data[i];
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	525 IrStruct::InterfaceMap::iterator iter = irstruct->interfaceMap.find(bc->base);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	526 assert(iter != irstruct->interfaceMap.end());
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	527
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	528 IrInterface* iri = iter->second;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	529 if (iri->vtbl)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	530 inits.push_back(iri->vtbl);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	531 else // abstract impl
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	532 inits.push_back(getNullPtr(getVoidPtrType()));
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	533
812 6c2ff06c4201 Fixed a nasty bug with how interface vtables for class initializers were output, causing some class fields to be skipped. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 809 diff changeset	534 lastoffset += lastsize;
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	535 lastsize = PTRSIZE;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	536 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	537
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	538 // return next offset
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	539 return lastoffset + lastsize;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	540 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	541
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	542 //////////////////////////////////////////////////////////////////////////////
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	543
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	544 // build the vtable initializer for class cd
835 3afe9f276db7 Added back a bunch of static's to gen/classes.cpp, it's not superfluous, it makes the functions internal to the compilation unit, and we don't call them anywhere else. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 833 diff changeset	545 static void init_class_vtbl_initializer(ClassDeclaration* cd)
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	546 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	547 // generate vtable initializer
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	548 std::vector<LLConstant*> sinits(cd->vtbl.dim, NULL);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	549
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	550 IrStruct* irstruct = cd->ir.irStruct;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	551
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	552 assert(cd->vtbl.dim > 1);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	553
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	554 // first entry always classinfo
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	555 assert(irstruct->classInfo);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	556 sinits[0] = DtoBitCast(irstruct->classInfo, DtoType(ClassDeclaration::classinfo->type));
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	557
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	558 // add virtual functions
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	559 for (int k=1; k < cd->vtbl.dim; k++)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	560 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	561 Dsymbol* dsym = (Dsymbol*)cd->vtbl.data[k];
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	562 assert(dsym);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	563
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	564 // Logger::println("vtbl[%d] = %s", k, dsym->toChars());
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	565
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	566 FuncDeclaration* fd = dsym->isFuncDeclaration();
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	567 assert(fd);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	568
802 28ce72c60a21 Fixed some problems with the addZeros forward declarations having type mismatches. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 801 diff changeset	569 // if function is abstract,
28ce72c60a21 Fixed some problems with the addZeros forward declarations having type mismatches. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 801 diff changeset	570 // or class is abstract, and func has no body,
28ce72c60a21 Fixed some problems with the addZeros forward declarations having type mismatches. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 801 diff changeset	571 // emit a null vtbl entry
799 9f92b6e40fd3 Do put zero in vtable initializer for function without body in abstract class. Christian Kamm <kamm incasoftware de> parents: 797 diff changeset	572 if (fd->isAbstract() \|\| (cd->isAbstract() && !fd->fbody))
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	573 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	574 sinits[k] = getNullPtr(getVoidPtrType());
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	575 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	576 else
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	577 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	578 DtoForceDeclareDsymbol(fd);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	579 assert(fd->ir.irFunc->func);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	580 sinits[k] = fd->ir.irFunc->func;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	581 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	582
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	583 // if (Logger::enabled())
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	584 // Logger::cout() << "vtbl[" << k << "] = " << *sinits[k] << std::endl;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	585 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	586
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	587 irstruct->constVtbl = LLConstantStruct::get(sinits);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	588
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	589 // refine type
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	590 llvm::cast<llvm::OpaqueType>(irstruct->vtblInitTy.get())->refineAbstractTypeTo(irstruct->constVtbl->getType());
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	591
825 a70ddd449e7d Commented some logging that could be '''very''' long, cuts -vv output size of a gtkd gl sample down 1.2GB by 3/4. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 821 diff changeset	592 // if (Logger::enabled())
a70ddd449e7d Commented some logging that could be '''very''' long, cuts -vv output size of a gtkd gl sample down 1.2GB by 3/4. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 821 diff changeset	593 // Logger::cout() << "vtbl initializer: " << *irstruct->constVtbl << std::endl;
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	594 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	595
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	596 //////////////////////////////////////////////////////////////////////////////
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	597
835 3afe9f276db7 Added back a bunch of static's to gen/classes.cpp, it's not superfluous, it makes the functions internal to the compilation unit, and we don't call them anywhere else. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 833 diff changeset	598 static void init_class_interface_vtbl_initializers(ClassDeclaration* cd)
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	599 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	600 IrStruct* irstruct = cd->ir.irStruct;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	601
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	602 // don't do anything if list is empty
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	603 if (irstruct->interfaceVec.empty())
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	604 return;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	605
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	606 std::vector<LLConstant*> inits;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	607 std::vector<LLConstant*> infoInits(3);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	608
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	609 // go through each interface
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	610 size_t ninter = irstruct->interfaceVec.size();
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	611 for (size_t i=0; i<ninter; i++)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	612 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	613 IrInterface* iri = irstruct->interfaceVec[i];
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	614 Logger::println("interface %s", iri->decl->toChars());
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	615
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	616 // build vtable intializer for this interface implementation
806 96b404ba7eb0 Move storage of final vtbl from BaseClass to IrInterface: BaseClass instances are shared! Christian Kamm <kamm incasoftware de> parents: 805 diff changeset	617 Array& arr = iri->vtblDecls;
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	618 size_t narr = arr.dim;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	619
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	620 if (narr > 0)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	621 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	622 inits.resize(narr, NULL);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	623
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	624 // first is always the interface info
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	625 assert(iri->info);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	626 inits[0] = iri->info;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	627
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	628 // build vtable
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	629 for (size_t j=1; j < narr; j++)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	630 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	631 Dsymbol* dsym = (Dsymbol*)arr.data[j];
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	632 if (!dsym)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	633 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	634 inits[j] = getNullPtr(getVoidPtrType());
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	635 continue;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	636 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	637
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	638 //Logger::println("ivtbl[%d] = %s", j, dsym->toChars());
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	639
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	640 // must all be functions
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	641 FuncDeclaration* fd = dsym->isFuncDeclaration();
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	642 assert(fd);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	643
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	644 if (fd->isAbstract())
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	645 inits[j] = getNullPtr(getVoidPtrType());
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	646 else
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	647 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	648 DtoForceDeclareDsymbol(fd);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	649
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	650 assert(fd->ir.irFunc->func);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	651 inits[j] = fd->ir.irFunc->func;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	652 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	653
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	654 //if (Logger::enabled())
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	655 // Logger::cout() << "ivtbl[" << j << "] = " << *inits[j] << std::endl;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	656 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	657
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	658 // build the constant
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	659 iri->vtblInit = LLConstantStruct::get(inits);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	660 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	661
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	662 // build the interface info for ClassInfo
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	663 // generate interface info initializer
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	664
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	665 DtoForceDeclareDsymbol(iri->decl);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	666
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	667 // classinfo
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	668 IrStruct* iris = iri->decl->ir.irStruct;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	669 assert(iris);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	670 assert(iris->classInfo);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	671 infoInits[0] = DtoBitCast(iris->classInfo, DtoType(ClassDeclaration::classinfo->type));
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	672
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	673 // vtbl
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	674 LLConstant* c;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	675 if (iri->vtbl)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	676 c = llvm::ConstantExpr::getBitCast(iri->vtbl, getPtrToType(getVoidPtrType()));
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	677 else
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	678 c = getNullPtr(getPtrToType(getVoidPtrType()));
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	679 infoInits[1] = DtoConstSlice(DtoConstSize_t(narr), c);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	680
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	681 // offset
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	682 size_t ioff;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	683 if (iri->index == 0)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	684 ioff = 0;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	685 else
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	686 ioff = gTargetData->getStructLayout(isaStruct(cd->type->ir.type->get()))->getElementOffset(iri->index);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	687
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	688 Logger::println("DMD interface offset: %d, LLVM interface offset: %lu", iri->base->offset, ioff);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	689 assert(iri->base->offset == ioff);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	690 infoInits[2] = DtoConstUint(ioff);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	691
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	692 // create interface info initializer constant
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	693 iri->infoInit = llvm::cast<llvm::ConstantStruct>(llvm::ConstantStruct::get(infoInits));
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	694 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	695 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	696
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	697 //////////////////////////////////////////////////////////////////////////////
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	698
835 3afe9f276db7 Added back a bunch of static's to gen/classes.cpp, it's not superfluous, it makes the functions internal to the compilation unit, and we don't call them anywhere else. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 833 diff changeset	699 static void DtoConstInitInterface(InterfaceDeclaration* cd)
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	700 {
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	701 if (cd->ir.initialized) return;
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	702 cd->ir.initialized = true;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	703
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	704 Logger::println("DtoConstInitClass(%s): %s", cd->toPrettyChars(), cd->loc.toChars());
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	705 LOG_SCOPE;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	706
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	707 init_class_interface_vtbl_initializers(cd);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	708 }
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	709
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	710 //////////////////////////////////////////////////////////////////////////////
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	711
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	712 void DtoConstInitClass(ClassDeclaration* cd)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	713 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	714 if (InterfaceDeclaration* it = cd->isInterfaceDeclaration())
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	715 {
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	716 DtoConstInitInterface(it);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	717 return;
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	718 }
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	719
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	720 if (cd->ir.initialized) return;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	721 cd->ir.initialized = 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	722
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	723 Logger::println("DtoConstInitClass(%s): %s", cd->toPrettyChars(), cd->loc.toChars());
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	724 LOG_SCOPE;
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	725
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	726 assert(!cd->isInterfaceDeclaration());
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	727
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	728 // make sure the baseclass is const initialized
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	729 if (cd->baseClass)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	730 DtoForceConstInitDsymbol(cd->baseClass);
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	731
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	732 // get IrStruct
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	733 IrStruct* irstruct = cd->ir.irStruct;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	734 gIR->structs.push_back(irstruct);
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	735
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	736 // get types
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	737 TypeClass* tc = (TypeClass*)cd->type;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	738 const llvm::StructType* structtype = isaStruct(tc->ir.type->get());
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	739 assert(structtype);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	740 const llvm::ArrayType* vtbltype = isaArray(irstruct->vtblTy.get());
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	741 assert(vtbltype);
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	742
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	743 // build initializer list
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	744 std::vector<LLConstant*> inits;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	745 inits.reserve(irstruct->varDecls.size());
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	746
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	747 // vtable is always first
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	748 assert(irstruct->vtbl != 0);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	749 inits.push_back(irstruct->vtbl);
423 3424f0fab7a9 Error instead of assert on unimplemented interface functions. Christian Kamm <kamm incasoftware de> parents: 422 diff changeset	750
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	751 // then comes monitor
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	752 inits.push_back(LLConstant::getNullValue(getVoidPtrType()));
423 3424f0fab7a9 Error instead of assert on unimplemented interface functions. Christian Kamm <kamm incasoftware de> parents: 422 diff changeset	753
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	754 // recursively do data and interface vtables
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	755 init_class_initializer(inits, cd, cd, 2 * PTRSIZE);
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	756
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	757 // build vtable initializer
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	758 init_class_vtbl_initializer(cd);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	759
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	760 // build interface vtables
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	761 init_class_interface_vtbl_initializers(cd);
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	762
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	763 // build constant from inits
812 6c2ff06c4201 Fixed a nasty bug with how interface vtables for class initializers were output, causing some class fields to be skipped. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 809 diff changeset	764 assert(!irstruct->constInit);
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	765 irstruct->constInit = LLConstantStruct::get(inits); // classes are never packed
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	766
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	767 // refine __initZ global type to the one of the initializer
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	768 llvm::cast<llvm::OpaqueType>(irstruct->initOpaque.get())->refineAbstractTypeTo(irstruct->constInit->getType());
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	769
825 a70ddd449e7d Commented some logging that could be '''very''' long, cuts -vv output size of a gtkd gl sample down 1.2GB by 3/4. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 821 diff changeset	770 // if (Logger::enabled())
a70ddd449e7d Commented some logging that could be '''very''' long, cuts -vv output size of a gtkd gl sample down 1.2GB by 3/4. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 821 diff changeset	771 // {
a70ddd449e7d Commented some logging that could be '''very''' long, cuts -vv output size of a gtkd gl sample down 1.2GB by 3/4. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 821 diff changeset	772 // Logger::cout() << "class " << cd->toChars() << std::endl;
a70ddd449e7d Commented some logging that could be '''very''' long, cuts -vv output size of a gtkd gl sample down 1.2GB by 3/4. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 821 diff changeset	773 // Logger::cout() << "type " << *cd->type->ir.type->get() << std::endl;
a70ddd449e7d Commented some logging that could be '''very''' long, cuts -vv output size of a gtkd gl sample down 1.2GB by 3/4. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 821 diff changeset	774 // Logger::cout() << "initializer " << *irstruct->constInit << std::endl;
a70ddd449e7d Commented some logging that could be '''very''' long, cuts -vv output size of a gtkd gl sample down 1.2GB by 3/4. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 821 diff changeset	775 // }
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	776
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	777 gIR->structs.pop_back();
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	778 }
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	779
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	780 //////////////////////////////////////////////////////////////////////////////////////////
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	781
835 3afe9f276db7 Added back a bunch of static's to gen/classes.cpp, it's not superfluous, it makes the functions internal to the compilation unit, and we don't call them anywhere else. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 833 diff changeset	782 static void DefineInterfaceInfos(IrStruct* irstruct)
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	783 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	784 // always do interface info array when possible
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	785 std::vector<LLConstant*> infoInits;
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	786
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	787 size_t n = irstruct->interfaceVec.size();
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	788 infoInits.reserve(n);
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	789
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	790 for (size_t i=0; i < n; i++)
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	791 {
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	792 IrInterface* iri = irstruct->interfaceVec[i];
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	793 assert(iri->infoInit);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	794 infoInits.push_back(iri->infoInit);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	795 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	796
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	797 // set initializer
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	798 if (!infoInits.empty())
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	799 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	800 const LLArrayType* arrty = LLArrayType::get(infoInits[0]->getType(), infoInits.size());
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	801 LLConstant* arrInit = llvm::ConstantArray::get(arrty, infoInits);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	802 irstruct->interfaceInfos->setInitializer(arrInit);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	803 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	804 else
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	805 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	806 assert(irstruct->interfaceInfos == NULL);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	807 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	808 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	809
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	810 //////////////////////////////////////////////////////////////////////////////////////////
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	811
835 3afe9f276db7 Added back a bunch of static's to gen/classes.cpp, it's not superfluous, it makes the functions internal to the compilation unit, and we don't call them anywhere else. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 833 diff changeset	812 static void DtoDefineInterface(InterfaceDeclaration* cd)
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	813 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	814 if (cd->ir.defined) return;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	815 cd->ir.defined = true;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	816
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	817 Logger::println("DtoDefineClass(%s): %s", cd->toPrettyChars(), cd->loc.toChars());
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	818 LOG_SCOPE;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	819
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	820 // defined interface infos
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	821 DefineInterfaceInfos(cd->ir.irStruct);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	822
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	823 // define the classinfo
940 39519a1ff603 Changed the way LDC determines if a template instantiation needs to get a definition, seems to speed up compile times quite a bit in some cases. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 920 diff changeset	824 if (mustDefineSymbol(cd))
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	825 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	826 DtoDefineClassInfo(cd);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	827 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	828 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	829
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	830 //////////////////////////////////////////////////////////////////////////////////////////
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	831
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	832 // FIXME: clean this up
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	833
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	834 void DtoDefineClass(ClassDeclaration* cd)
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	835 {
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	836 if (InterfaceDeclaration* id = cd->isInterfaceDeclaration())
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	837 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	838 DtoDefineInterface(id);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	839 return;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	840 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	841
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	842 if (cd->ir.defined) return;
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	843 cd->ir.defined = true;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	844
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	845 Logger::println("DtoDefineClass(%s): %s", cd->toPrettyChars(), cd->loc.toChars());
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	846 LOG_SCOPE;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	847
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	848 // get the struct (class) type
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	849 assert(cd->type->ty == Tclass);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	850 TypeClass* ts = (TypeClass*)cd->type;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	851
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	852 IrStruct* irstruct = cd->ir.irStruct;
177 cea8dcfa76df [svn r193] Fixed: abstract classes implementing interfaces now output proper Interface info arrays. (null vtables). lindquist parents: 173 diff changeset	853
940 39519a1ff603 Changed the way LDC determines if a template instantiation needs to get a definition, seems to speed up compile times quite a bit in some cases. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 920 diff changeset	854 assert(mustDefineSymbol(cd));
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	855
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	856 // sanity check
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	857 assert(irstruct->init);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	858 assert(irstruct->constInit);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	859 assert(irstruct->vtbl);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	860 assert(irstruct->constVtbl);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	861
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	862 // if (Logger::enabled())
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	863 // {
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	864 // Logger::cout() << "initZ: " << *irstruct->init << std::endl;
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	865 // Logger::cout() << "cinitZ: " << *irstruct->constInit << std::endl;
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	866 // Logger::cout() << "vtblZ: " << *irstruct->vtbl << std::endl;
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	867 // Logger::cout() << "cvtblZ: " << *irstruct->constVtbl << std::endl;
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	868 // }
177 cea8dcfa76df [svn r193] Fixed: abstract classes implementing interfaces now output proper Interface info arrays. (null vtables). lindquist parents: 173 diff changeset	869
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	870 // set initializers
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	871 irstruct->init->setInitializer(irstruct->constInit);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	872 irstruct->vtbl->setInitializer(irstruct->constVtbl);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	873
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	874 // initialize interface vtables
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	875 size_t n = irstruct->interfaceVec.size();
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	876 for (size_t i=0; i<n; i++)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	877 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	878 IrInterface* iri = irstruct->interfaceVec[i];
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	879 Logger::println("interface %s", iri->base->base->toChars());
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	880 assert(iri->vtblInit);
123 7f9a0a58394b [svn r127] Updated the lphobos build scripts a little. Created a new rebuild profile. lindquist parents: 121 diff changeset	881
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	882 // refine the init type
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	883 llvm::cast<llvm::OpaqueType>(iri->vtblInitTy.get())->refineAbstractTypeTo(iri->vtblInit->getType());
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	884
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	885 // apply initializer
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	886 assert(iri->vtbl);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	887 iri->vtbl->setInitializer(iri->vtblInit);
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	888 }
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	889
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	890 DefineInterfaceInfos(irstruct);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	891
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	892 // generate classinfo
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	893 DtoDefineClassInfo(cd);
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	894 }
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	895
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	896 //////////////////////////////////////////////////////////////////////////////////////////
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	897
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	898 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	899 {
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	900 // resolve type
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	901 DtoForceDeclareDsymbol(tc->sym);
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	902
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	903 // allocate
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	904 LLValue* mem;
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	905 if (newexp->onstack)
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	906 {
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	907 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	908 }
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	909 // 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	910 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	911 {
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	912 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	913 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	914 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	915 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	916 }
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	917 // default allocator
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	918 else
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	919 {
728 635f91212b78 Change _d_newclass into _d_allocclass. Add initialization to ClassInfo.create. Christian Kamm <kamm incasoftware de> parents: 705 diff changeset	920 llvm::Function* fn = LLVM_D_GetRuntimeFunction(gIR->module, "_d_allocclass");
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	921 LLConstant* ci = DtoBitCast(tc->sym->ir.irStruct->classInfo, DtoType(ClassDeclaration::classinfo->type));
1013 8c73ff5f69e0 Use llvm::CallSite instead of custom CallOrInvoke class. Frits van Bommel <fvbommel wxs.nl> parents: 945 diff changeset	922 mem = gIR->CreateCallOrInvoke(fn, ci, ".newclass_gc_alloc").getInstruction();
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	923 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	924 }
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	925
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	926 // init
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	927 DtoInitClass(tc, mem);
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	928
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	929 // 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	930 if (newexp->thisexp)
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 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	933 LOG_SCOPE;
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	934 DValue* thisval = newexp->thisexp->toElem(gIR);
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	935 size_t idx = tc->sym->vthis->ir.irField->index;
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	936 LLValue* src = thisval->getRVal();
7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	937 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	938 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	939 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	940 DtoStore(src, dst);
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	941 }
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	942 // 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	943 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	944 {
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	945 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	946 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	947
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	948 // 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	949 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	950
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	951 // store into right location
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	952 size_t idx = tc->sym->vthis->ir.irField->index;
370 051ab876fe11 [svn r391] Fix classes nested inside functions for real. ChristianK parents: 369 diff changeset	953 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	954 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	955 }
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	956
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	957 // call constructor
160 b77664331d06 [svn r176] Fixed a bug with class constructors. lindquist parents: 157 diff changeset	958 if (newexp->member)
b77664331d06 [svn r176] Fixed a bug with class constructors. lindquist parents: 157 diff changeset	959 {
1047 6bb04dbee21f Some calling convention work for x86-64: Frits van Bommel <fvbommel wxs.nl> parents: 1013 diff changeset	960 Logger::println("Calling constructor");
160 b77664331d06 [svn r176] Fixed a bug with class constructors. lindquist parents: 157 diff changeset	961 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	962 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	963 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	964 return DtoCallFunction(newexp->loc, tc, &dfn, newexp->arguments);
160 b77664331d06 [svn r176] Fixed a bug with class constructors. lindquist parents: 157 diff changeset	965 }
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	966
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	967 // 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	968 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	969 }
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	970
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	971 //////////////////////////////////////////////////////////////////////////////////////////
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	972
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	973 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	974 {
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	975 DtoForceConstInitDsymbol(tc->sym);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	976
945 03d7c4aac654 SWITCHED TO LLVM 2.5 ! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 940 diff changeset	977 size_t presz = 2*getTypePaddedSize(DtoSize_t());
03d7c4aac654 SWITCHED TO LLVM 2.5 ! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 940 diff changeset	978 uint64_t n = getTypePaddedSize(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	979
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	980 // 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	981 assert(tc->sym->ir.irStruct->vtbl);
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	982 LLValue* tmp = DtoGEPi(dst,0,0,"vtbl");
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	983 LLValue* val = DtoBitCast(tc->sym->ir.irStruct->vtbl, tmp->getType()->getContainedType(0));
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	984 DtoStore(val, tmp);
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	985
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	986 // monitor always defaults to zero
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	987 tmp = DtoGEPi(dst,0,1,"monitor");
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	988 val = llvm::Constant::getNullValue(tmp->getType()->getContainedType(0));
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	989 DtoStore(val, tmp);
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	990
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	991 // done?
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	992 if (n == 0)
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	993 return;
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	994
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	995 // copy the rest from the static initializer
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	996 assert(tc->sym->ir.irStruct->init);
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	997
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	998 LLValue* dstarr = DtoGEPi(dst,0,2,"tmp");
7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	999 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	1000
244 a95056b3c996 [svn r261] Fixed debug info for integer and floating local variables, can now be inspected in GDB. lindquist parents: 217 diff changeset	1001 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	1002 }
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1003
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1004 //////////////////////////////////////////////////////////////////////////////////////////
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1005
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	1006 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	1007 {
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	1008 // 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	1009 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	1010 // build args
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	1011 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	1012 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	1013 // call
315 a9697749e898 [svn r336] Made sure calls within a landing pad area are invokes. ChristianK parents: 309 diff changeset	1014 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	1015 }
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	1016
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	1017 //////////////////////////////////////////////////////////////////////////////////////////
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	1018
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1019 DValue* DtoCastClass(DValue* val, Type* _to)
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1020 {
138 aeddd4d533b3 [svn r142] minor fix to dynamic casts. lindquist parents: 137 diff changeset	1021 Logger::println("DtoCastClass(%s, %s)", val->getType()->toChars(), _to->toChars());
aeddd4d533b3 [svn r142] minor fix to dynamic casts. lindquist parents: 137 diff changeset	1022 LOG_SCOPE;
aeddd4d533b3 [svn r142] minor fix to dynamic casts. lindquist parents: 137 diff changeset	1023
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	1024 Type* to = _to->toBasetype();
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1025
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1026 // class -> pointer
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1027 if (to->ty == Tpointer) {
778 4adf0f742896 Get rid of DtoBoolean - use DtoCast(... Type::tbool) instead. Christian Kamm <kamm incasoftware de> parents: 758 diff changeset	1028 Logger::println("to pointer");
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	1029 const LLType* tolltype = DtoType(_to);
7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	1030 LLValue* rval = DtoBitCast(val->getRVal(), tolltype);
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1031 return new DImValue(_to, rval);
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1032 }
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1033 // class -> bool
778 4adf0f742896 Get rid of DtoBoolean - use DtoCast(... Type::tbool) instead. Christian Kamm <kamm incasoftware de> parents: 758 diff changeset	1034 else if (to->ty == Tbool) {
4adf0f742896 Get rid of DtoBoolean - use DtoCast(... Type::tbool) instead. Christian Kamm <kamm incasoftware de> parents: 758 diff changeset	1035 Logger::println("to bool");
4adf0f742896 Get rid of DtoBoolean - use DtoCast(... Type::tbool) instead. Christian Kamm <kamm incasoftware de> parents: 758 diff changeset	1036 LLValue* llval = val->getRVal();
4adf0f742896 Get rid of DtoBoolean - use DtoCast(... Type::tbool) instead. Christian Kamm <kamm incasoftware de> parents: 758 diff changeset	1037 LLValue* zero = LLConstant::getNullValue(llval->getType());
4adf0f742896 Get rid of DtoBoolean - use DtoCast(... Type::tbool) instead. Christian Kamm <kamm incasoftware de> parents: 758 diff changeset	1038 return new DImValue(_to, gIR->ir->CreateICmpNE(llval, zero, "tmp"));
4adf0f742896 Get rid of DtoBoolean - use DtoCast(... Type::tbool) instead. Christian Kamm <kamm incasoftware de> parents: 758 diff changeset	1039 }
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1040
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1041 // must be class/interface
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1042 assert(to->ty == Tclass);
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1043 TypeClass* tc = (TypeClass*)to;
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1044
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1045 // from type
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	1046 Type* from = val->getType()->toBasetype();
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1047 TypeClass* fc = (TypeClass*)from;
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1048
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1049 // x -> interface
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1050 if (InterfaceDeclaration* it = tc->sym->isInterfaceDeclaration()) {
138 aeddd4d533b3 [svn r142] minor fix to dynamic casts. lindquist parents: 137 diff changeset	1051 Logger::println("to interface");
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1052 // interface -> interface
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1053 if (fc->sym->isInterfaceDeclaration()) {
138 aeddd4d533b3 [svn r142] minor fix to dynamic casts. lindquist parents: 137 diff changeset	1054 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	1055 return DtoDynamicCastInterface(val, _to);
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1056 }
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1057 // class -> interface - static cast
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1058 else if (it->isBaseOf(fc->sym,NULL)) {
833 482cd74d1c71 Add all base interfaces to interfaceMap, not just direct parents. Christian Kamm <kamm incasoftware de> parents: 825 diff changeset	1059 Logger::println("static down cast");
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1060 // get the from class
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1061 ClassDeclaration* cd = fc->sym->isClassDeclaration();
840 a125ada7fd95 more moreatatime fixes Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 839 diff changeset	1062 DtoResolveClass(cd); // add this
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1063 IrStruct* irstruct = cd->ir.irStruct;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1064 // find interface impl
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1065 IrStruct::InterfaceMapIter iriter = irstruct->interfaceMap.find(it);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1066 assert(iriter != irstruct->interfaceMap.end());
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1067 IrInterface* iri = iriter->second;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1068 // offset pointer
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1069 LLValue* v = val->getRVal();
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1070 v = DtoGEPi(v, 0, iri->index);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1071 if (Logger::enabled())
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1072 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1073 Logger::cout() << "V = " << *v << std::endl;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1074 Logger::cout() << "T = " << *DtoType(_to) << std::endl;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1075 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1076 v = DtoBitCast(v, DtoType(_to));
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1077 // return r-value
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1078 return new DImValue(_to, v);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1079 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1080 // class -> interface
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1081 else {
138 aeddd4d533b3 [svn r142] minor fix to dynamic casts. lindquist parents: 137 diff changeset	1082 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	1083 return DtoDynamicCastObject(val, _to);
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1084 }
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1085 }
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1086 // x -> class
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1087 else {
778 4adf0f742896 Get rid of DtoBoolean - use DtoCast(... Type::tbool) instead. Christian Kamm <kamm incasoftware de> parents: 758 diff changeset	1088 Logger::println("to class");
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1089 int poffset;
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1090 // interface -> class
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1091 if (fc->sym->isInterfaceDeclaration()) {
138 aeddd4d533b3 [svn r142] minor fix to dynamic casts. lindquist parents: 137 diff changeset	1092 Logger::println("interface cast");
906 f1ed7fe85138 Casts from interface to class generally need to be dynamic. Fixes #189. Christian Kamm <kamm incasoftware de> parents: 840 diff changeset	1093 return DtoDynamicCastInterface(val, _to);
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1094 }
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1095 // class -> class - static down cast
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1096 else if (tc->sym->isBaseOf(fc->sym,NULL)) {
906 f1ed7fe85138 Casts from interface to class generally need to be dynamic. Fixes #189. Christian Kamm <kamm incasoftware de> parents: 840 diff changeset	1097 Logger::println("static down cast");
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	1098 const LLType* tolltype = DtoType(_to);
7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	1099 LLValue* rval = DtoBitCast(val->getRVal(), tolltype);
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1100 return new DImValue(_to, rval);
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1101 }
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1102 // class -> class - dynamic up cast
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1103 else {
138 aeddd4d533b3 [svn r142] minor fix to dynamic casts. lindquist parents: 137 diff changeset	1104 Logger::println("dynamic up cast");
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1105 return DtoDynamicCastObject(val, _to);
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1106 }
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1107 }
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1108 }
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1109
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1110 //////////////////////////////////////////////////////////////////////////////////////////
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1111
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1112 DValue* DtoDynamicCastObject(DValue* val, Type* _to)
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1113 {
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1114 // call:
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1115 // Object _d_dynamic_cast(Object o, ClassInfo c)
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1116
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1117 DtoForceDeclareDsymbol(ClassDeclaration::object);
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1118 DtoForceDeclareDsymbol(ClassDeclaration::classinfo);
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1119
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1120 llvm::Function* func = LLVM_D_GetRuntimeFunction(gIR->module, "_d_dynamic_cast");
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1121 const llvm::FunctionType* funcTy = func->getFunctionType();
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1122
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	1123 std::vector<LLValue*> args;
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1124
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1125 // Object o
217 0806379a5eca [svn r233] Added: -oq command line option for writing fully qualified object names. lindquist parents: 213 diff changeset	1126 LLValue* obj = val->getRVal();
0806379a5eca [svn r233] Added: -oq command line option for writing fully qualified object names. lindquist parents: 213 diff changeset	1127 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	1128 assert(funcTy->getParamType(0) == obj->getType());
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1129
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1130 // 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	1131 TypeClass* to = (TypeClass*)_to->toBasetype();
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1132 DtoForceDeclareDsymbol(to->sym);
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	1133 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	1134 LLValue* cinfo = to->sym->ir.irStruct->classInfo;
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1135 // 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	1136 // 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	1137 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	1138 assert(funcTy->getParamType(1) == cinfo->getType());
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1139
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1140 // call it
1013 8c73ff5f69e0 Use llvm::CallSite instead of custom CallOrInvoke class. Frits van Bommel <fvbommel wxs.nl> parents: 945 diff changeset	1141 LLValue* ret = gIR->CreateCallOrInvoke2(func, obj, cinfo, "tmp").getInstruction();
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1142
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1143 // cast return value
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1144 ret = DtoBitCast(ret, DtoType(_to));
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1145
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1146 return new DImValue(_to, ret);
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1147 }
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1148
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1149 //////////////////////////////////////////////////////////////////////////////////////////
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1150
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1151 DValue* DtoCastInterfaceToObject(DValue* val, Type* to)
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1152 {
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1153 // call:
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1154 // Object _d_toObject(void* p)
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1155
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1156 llvm::Function* func = LLVM_D_GetRuntimeFunction(gIR->module, "_d_toObject");
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1157 const llvm::FunctionType* funcTy = func->getFunctionType();
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1158
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1159 // void* p
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	1160 LLValue* tmp = val->getRVal();
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1161 tmp = DtoBitCast(tmp, funcTy->getParamType(0));
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1162
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1163 // call it
1013 8c73ff5f69e0 Use llvm::CallSite instead of custom CallOrInvoke class. Frits van Bommel <fvbommel wxs.nl> parents: 945 diff changeset	1164 LLValue* ret = gIR->CreateCallOrInvoke(func, tmp, "tmp").getInstruction();
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1165
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1166 // cast return value
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1167 if (to != NULL)
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1168 ret = DtoBitCast(ret, DtoType(to));
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1169 else
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1170 to = ClassDeclaration::object->type;
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1171
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1172 return new DImValue(to, ret);
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1173 }
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1174
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1175 //////////////////////////////////////////////////////////////////////////////////////////
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1176
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1177 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	1178 {
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1179 // call:
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1180 // 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	1181
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1182 DtoForceDeclareDsymbol(ClassDeclaration::object);
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1183 DtoForceDeclareDsymbol(ClassDeclaration::classinfo);
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1184
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1185 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	1186 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	1187
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	1188 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	1189
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1190 // void* p
217 0806379a5eca [svn r233] Added: -oq command line option for writing fully qualified object names. lindquist parents: 213 diff changeset	1191 LLValue* ptr = val->getRVal();
0806379a5eca [svn r233] Added: -oq command line option for writing fully qualified object names. lindquist parents: 213 diff changeset	1192 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	1193
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1194 // 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	1195 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	1196 DtoForceDeclareDsymbol(to->sym);
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	1197 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	1198 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	1199 // 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	1200 // 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	1201 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	1202
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1203 // call it
1013 8c73ff5f69e0 Use llvm::CallSite instead of custom CallOrInvoke class. Frits van Bommel <fvbommel wxs.nl> parents: 945 diff changeset	1204 LLValue* ret = gIR->CreateCallOrInvoke2(func, ptr, cinfo, "tmp").getInstruction();
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1205
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1206 // cast return value
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1207 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	1208
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1209 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	1210 }
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1211
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1212 //////////////////////////////////////////////////////////////////////////////////////////
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1213
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	1214 LLValue* DtoIndexClass(LLValue* src, ClassDeclaration* cd, VarDeclaration* vd)
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1215 {
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	1216 Logger::println("indexing class field %s:", vd->toPrettyChars());
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1217 LOG_SCOPE;
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1218
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	1219 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	1220 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	1221
839 162a0502a6b9 Fixed another moreatatime (as opposed to oneatatime) issue with indexing unresolved class. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 837 diff changeset	1222 // make sure class is resolved
162a0502a6b9 Fixed another moreatatime (as opposed to oneatatime) issue with indexing unresolved class. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 837 diff changeset	1223 DtoResolveClass(cd);
162a0502a6b9 Fixed another moreatatime (as opposed to oneatatime) issue with indexing unresolved class. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 837 diff changeset	1224
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	1225 // 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	1226 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	1227 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	1228
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1229 // get the start pointer
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	1230 const LLType* st = DtoType(cd->type);
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1231 // cast to the struct 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	1232 src = DtoBitCast(src, st);
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1233
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1234 // gep to the index
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1235 if (Logger::enabled())
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1236 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1237 Logger::cout() << "src2: " << *src << '\n';
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1238 Logger::cout() << "index: " << field->index << '\n';
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1239 Logger::cout() << "srctype: " << *src->getType() << '\n';
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1240 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1241 LLValue* val = DtoGEPi(src, 0, field->index);
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1242
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1243 // do we need to offset further? (union area)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1244 if (field->unionOffset)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1245 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1246 // cast to void*
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1247 val = DtoBitCast(val, getVoidPtrType());
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1248 // offset
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1249 val = DtoGEPi1(val, field->unionOffset);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1250 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1251
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1252 // cast it to the right type
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1253 val = DtoBitCast(val, getPtrToType(DtoType(vd->type)));
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1254
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	1255 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	1256 Logger::cout() << "value: " << *val << '\n';
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1257
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	1258 return val;
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1259 }
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1260
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1261 //////////////////////////////////////////////////////////////////////////////////////////
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1262
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	1263 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	1264 {
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1265 // sanity checks
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1266 assert(fdecl->isVirtual());
837 331a176c1f4f Removed error on naked, not fully complete, but I'll be doing more work on it during this Christmas, and some things do work. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 835 diff changeset	1267 assert(!fdecl->isFinal());
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1268 assert(fdecl->vtblIndex > 0); // 0 is always ClassInfo/Interface*
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	1269 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	1270
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1271 // get instance
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	1272 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	1273 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	1274 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	1275
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1276 LLValue* funcval = vthis;
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1277 // get the vtbl for objects
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1278 if (!fdecl->isMember()->isInterfaceDeclaration())
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1279 funcval = DtoGEPi(funcval, 0, 0, "tmp");
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1280 // load vtbl ptr
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1281 funcval = DtoLoad(funcval);
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1282 // index vtbl
804 236f4b5eddca Removed use of DMD's toPrettyChars function for providing llvm value names. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 803 diff changeset	1283 funcval = DtoGEPi(funcval, 0, fdecl->vtblIndex, fdecl->toChars());
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1284 // load funcptr
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1285 funcval = DtoLoad(funcval);
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1286
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	1287 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	1288 Logger::cout() << "funcval: " << *funcval << '\n';
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	1289
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1290 // cast to final funcptr type
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	1291 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	1292 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	1293 Logger::cout() << "funcval casted: " << *funcval << '\n';
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	1294
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1295 return funcval;
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1296 }
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1297
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1298 //////////////////////////////////////////////////////////////////////////////////////////
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1299
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1300 void DtoDeclareClassInfo(ClassDeclaration* cd)
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1301 {
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1302 IrStruct* irstruct = cd->ir.irStruct;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1303
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1304 if (irstruct->classInfoDeclared) return;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1305 irstruct->classInfoDeclared = true;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1306
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	1307 Logger::println("DtoDeclareClassInfo(%s)", cd->toChars());
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1308 LOG_SCOPE;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1309
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1310 // resovle ClassInfo
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1311 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	1312 DtoResolveClass(cinfo);
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1313
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1314 // do the mangle
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1315 std::string gname("_D");
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1316 gname.append(cd->mangle());
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1317 if (!cd->isInterfaceDeclaration())
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1318 gname.append("7__ClassZ");
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1319 else
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1320 gname.append("11__InterfaceZ");
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1321
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1322 // create global
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1323 irstruct->classInfo = new llvm::GlobalVariable(irstruct->classInfoOpaque.get(), false, DtoLinkage(cd), NULL, gname, gIR->module);
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1324 }
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1325
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1326 //////////////////////////////////////////////////////////////////////////////////////////
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1327
821 8f0b24bc55f0 Added CMake option to disable generation of ClassInfo.offTi arrays, defaults to OFF. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 816 diff changeset	1328 #if GENERATE_OFFTI
8f0b24bc55f0 Added CMake option to disable generation of ClassInfo.offTi arrays, defaults to OFF. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 816 diff changeset	1329
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1330 // build a single element for the OffsetInfo[] of ClassInfo
835 3afe9f276db7 Added back a bunch of static's to gen/classes.cpp, it's not superfluous, it makes the functions internal to the compilation unit, and we don't call them anywhere else. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 833 diff changeset	1331 static LLConstant* build_offti_entry(ClassDeclaration* cd, VarDeclaration* vd)
110 e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1332 {
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1333 std::vector<LLConstant*> inits(2);
110 e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1334
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1335 // size_t offset;
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1336 //
271 1e6e2b5d5bfe [svn r292] Fixed: string switch was broken in several ways. lindquist parents: 268 diff changeset	1337 assert(vd->ir.irField);
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1338 // grab the offset from llvm and the formal class type
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1339 size_t offset = gTargetData->getStructLayout(isaStruct(cd->type->ir.type->get()))->getElementOffset(vd->ir.irField->index);
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1340 // offset nested struct/union fields
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1341 offset += vd->ir.irField->unionOffset;
110 e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1342
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1343 // assert that it matches DMD
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1344 Logger::println("offsets: %lu vs %u", offset, vd->offset);
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1345 assert(offset == vd->offset);
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1346
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1347 inits[0] = DtoConstSize_t(offset);
110 e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1348
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1349 // TypeInfo ti;
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1350 inits[1] = DtoTypeInfoOf(vd->type, true);
110 e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1351
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1352 // done
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1353 return llvm::ConstantStruct::get(inits);
110 e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1354 }
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1355
835 3afe9f276db7 Added back a bunch of static's to gen/classes.cpp, it's not superfluous, it makes the functions internal to the compilation unit, and we don't call them anywhere else. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 833 diff changeset	1356 static LLConstant* build_offti_array(ClassDeclaration* cd, const LLType* arrayT)
110 e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1357 {
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1358 IrStruct* irstruct = cd->ir.irStruct;
110 e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1359
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1360 size_t nvars = irstruct->varDecls.size();
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1361 std::vector<LLConstant*> arrayInits(nvars);
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1362
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1363 for (size_t i=0; i<nvars; i++)
110 e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1364 {
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1365 arrayInits[i] = build_offti_entry(cd, irstruct->varDecls[i]);
110 e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1366 }
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1367
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1368 LLConstant* size = DtoConstSize_t(nvars);
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	1369 LLConstant* ptr;
110 e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1370
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1371 if (nvars == 0)
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1372 return LLConstant::getNullValue( arrayT );
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1373
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1374 // array type
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1375 const llvm::ArrayType* arrTy = llvm::ArrayType::get(arrayInits[0]->getType(), nvars);
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1376 LLConstant* arrInit = llvm::ConstantArray::get(arrTy, arrayInits);
110 e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1377
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1378 // mangle
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1379 std::string name(cd->type->vtinfo->toChars());
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1380 name.append("__OffsetTypeInfos");
149 4c577c2b7229 [svn r155] Fixed a bunch of linkage problems (especially with templates) lindquist parents: 147 diff changeset	1381
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1382 // create symbol
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1383 llvm::GlobalVariable* gvar = new llvm::GlobalVariable(arrTy,true,DtoInternalLinkage(cd),arrInit,name,gIR->module);
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1384 ptr = DtoBitCast(gvar, getPtrToType(arrTy->getElementType()));
110 e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1385
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1386 return DtoConstSlice(size, ptr);
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1387 }
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1388
821 8f0b24bc55f0 Added CMake option to disable generation of ClassInfo.offTi arrays, defaults to OFF. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 816 diff changeset	1389 #endif // GENERATE_OFFTI
8f0b24bc55f0 Added CMake option to disable generation of ClassInfo.offTi arrays, defaults to OFF. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 816 diff changeset	1390
835 3afe9f276db7 Added back a bunch of static's to gen/classes.cpp, it's not superfluous, it makes the functions internal to the compilation unit, and we don't call them anywhere else. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 833 diff changeset	1391 static LLConstant* build_class_dtor(ClassDeclaration* cd)
112 368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1392 {
268 23d0d9855cad [svn r289] Fixed: right shift >> was broken for unsigned types. lindquist parents: 244 diff changeset	1393 FuncDeclaration* dtor = cd->dtor;
23d0d9855cad [svn r289] Fixed: right shift >> was broken for unsigned types. lindquist parents: 244 diff changeset	1394
23d0d9855cad [svn r289] Fixed: right shift >> was broken for unsigned types. lindquist parents: 244 diff changeset	1395 // if no destructor emit a null
23d0d9855cad [svn r289] Fixed: right shift >> was broken for unsigned types. lindquist parents: 244 diff changeset	1396 if (!dtor)
23d0d9855cad [svn r289] Fixed: right shift >> was broken for unsigned types. lindquist parents: 244 diff changeset	1397 return getNullPtr(getVoidPtrType());
23d0d9855cad [svn r289] Fixed: right shift >> was broken for unsigned types. lindquist parents: 244 diff changeset	1398
23d0d9855cad [svn r289] Fixed: right shift >> was broken for unsigned types. lindquist parents: 244 diff changeset	1399 DtoForceDeclareDsymbol(dtor);
23d0d9855cad [svn r289] Fixed: right shift >> was broken for unsigned types. lindquist parents: 244 diff changeset	1400 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	1401 }
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1402
835 3afe9f276db7 Added back a bunch of static's to gen/classes.cpp, it's not superfluous, it makes the functions internal to the compilation unit, and we don't call them anywhere else. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 833 diff changeset	1403 static unsigned build_classinfo_flags(ClassDeclaration* cd)
112 368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1404 {
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1405 // 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	1406 unsigned flags = 0;
112 368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1407 //flags \|= isCOMclass(); // IUnknown
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1408 bool hasOffTi = false;
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1409 if (cd->ctor) flags \|= 8;
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1410 for (ClassDeclaration *cd2 = cd; cd2; cd2 = cd2->baseClass)
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1411 {
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1412 if (cd2->members)
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1413 {
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1414 for (size_t i = 0; i < cd2->members->dim; i++)
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1415 {
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1416 Dsymbol sm = (Dsymbol )cd2->members->data[i];
275 665b81613475 [svn r296] Removed: the 'suite' dir, it never took off! lindquist parents: 271 diff changeset	1417 if (sm->isVarDeclaration() && !sm->isVarDeclaration()->isDataseg()) // is this enough?
112 368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1418 hasOffTi = true;
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1419 //printf("sm = %s %s\n", sm->kind(), sm->toChars());
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1420 if (sm->hasPointers())
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1421 goto L2;
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1422 }
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1423 }
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1424 }
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1425 flags \|= 2; // no pointers
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1426 L2:
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1427 if (hasOffTi)
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1428 flags \|= 4;
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1429 return flags;
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1430 }
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1431
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1432 void DtoDefineClassInfo(ClassDeclaration* cd)
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1433 {
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1434 // The layout is:
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1435 // {
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1436 // void **vptr;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1437 // monitor_t monitor;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1438 // byte[] initializer; // static initialization data
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1439 // char[] name; // class name
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1440 // void *[] vtbl;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1441 // Interface[] interfaces;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1442 // ClassInfo *base; // base class
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1443 // void *destructor;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1444 // void *invariant; // class invariant
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1445 // uint flags;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1446 // void *deallocator;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1447 // OffsetTypeInfo[] offTi;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1448 // void *defaultConstructor;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1449 // }
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1450
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1451 IrStruct* ir = cd->ir.irStruct;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1452
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1453 if (ir->classInfoDefined) return;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1454 ir->classInfoDefined = 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	1455
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	1456 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	1457 LOG_SCOPE;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1458
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	1459 assert(cd->type->ty == Tclass);
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1460 assert(ir->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	1461
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	1462 TypeClass* cdty = (TypeClass*)cd->type;
812 6c2ff06c4201 Fixed a nasty bug with how interface vtables for class initializers were output, causing some class fields to be skipped. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 809 diff changeset	1463 if (!cd->isInterfaceDeclaration())
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1464 {
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1465 assert(ir->init);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1466 assert(ir->constInit);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1467 assert(ir->vtbl);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1468 assert(ir->constVtbl);
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1469 }
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1470
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1471 // 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	1472 std::vector<LLConstant*> inits;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1473
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1474 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	1475 DtoForceConstInitDsymbol(cinfo);
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1476
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	1477 LLConstant* c;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1478
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1479 const LLType* voidPtr = getVoidPtrType();
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1480 const LLType* voidPtrPtr = getPtrToType(voidPtr);
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1481
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1482 // own vtable
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1483 c = cinfo->ir.irStruct->vtbl;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1484 assert(c);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1485 inits.push_back(c);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1486
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1487 // monitor
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1488 c = LLConstant::getNullValue(voidPtr);
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	1489 inits.push_back(c);
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1490
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	1491 // byte[] init
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1492 if (cd->isInterfaceDeclaration())
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1493 c = DtoConstSlice(DtoConstSize_t(0), LLConstant::getNullValue(voidPtr));
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1494 else
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1495 {
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1496 c = DtoBitCast(ir->init, voidPtr);
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1497 //Logger::cout() << *ir->constInit->getType() << std::endl;
945 03d7c4aac654 SWITCHED TO LLVM 2.5 ! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 940 diff changeset	1498 size_t initsz = getTypePaddedSize(ir->init->getType()->getContainedType(0));
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1499 c = DtoConstSlice(DtoConstSize_t(initsz), c);
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1500 }
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1501 inits.push_back(c);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1502
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1503 // class name
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1504 // from dmd
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1505 char *name = cd->ident->toChars();
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1506 size_t namelen = strlen(name);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1507 if (!(namelen > 9 && memcmp(name, "TypeInfo_", 9) == 0))
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1508 {
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1509 name = cd->toPrettyChars();
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1510 namelen = strlen(name);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1511 }
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1512 c = DtoConstString(name);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1513 inits.push_back(c);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1514
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1515 // vtbl array
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1516 if (cd->isInterfaceDeclaration())
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1517 c = DtoConstSlice(DtoConstSize_t(0), LLConstant::getNullValue(getPtrToType(voidPtr)));
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1518 else {
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1519 c = DtoBitCast(ir->vtbl, voidPtrPtr);
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1520 c = DtoConstSlice(DtoConstSize_t(cd->vtbl.dim), c);
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1521 }
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1522 inits.push_back(c);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1523
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1524 // interfaces array
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1525 VarDeclaration* intersVar = (VarDeclaration*)cinfo->fields.data[3];
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1526 const LLType* intersTy = DtoType(intersVar->type);
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1527 if (!ir->interfaceInfos)
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1528 c = LLConstant::getNullValue(intersTy);
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1529 else {
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1530 const LLType* t = intersTy->getContainedType(1); // .ptr
816 7d16ce7ad19d Made ClassInfo.interfaces generation consistent with DMD, fixes #134 Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 812 diff changeset	1531 // cast to Interface*
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1532 c = DtoBitCast(ir->interfaceInfos, t);
816 7d16ce7ad19d Made ClassInfo.interfaces generation consistent with DMD, fixes #134 Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 812 diff changeset	1533 size_t isz = ir->interfaceVec.size();
7d16ce7ad19d Made ClassInfo.interfaces generation consistent with DMD, fixes #134 Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 812 diff changeset	1534 size_t iisz = ir->classInfoInterfaces.size();
7d16ce7ad19d Made ClassInfo.interfaces generation consistent with DMD, fixes #134 Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 812 diff changeset	1535 assert(iisz <= isz);
7d16ce7ad19d Made ClassInfo.interfaces generation consistent with DMD, fixes #134 Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 812 diff changeset	1536 // offset - we only want the 'iisz' last ones
7d16ce7ad19d Made ClassInfo.interfaces generation consistent with DMD, fixes #134 Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 812 diff changeset	1537 LLConstant* idx = DtoConstUint(isz - iisz);
7d16ce7ad19d Made ClassInfo.interfaces generation consistent with DMD, fixes #134 Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 812 diff changeset	1538 c = llvm::ConstantExpr::getGetElementPtr(c, &idx, 1);
7d16ce7ad19d Made ClassInfo.interfaces generation consistent with DMD, fixes #134 Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 812 diff changeset	1539 // make array
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1540 c = DtoConstSlice(DtoConstSize_t(iisz), c);
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1541 }
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1542 inits.push_back(c);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1543
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1544 // base classinfo
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1545 // interfaces never get a base , just the interfaces[]
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1546 if (cd->baseClass && !cd->isInterfaceDeclaration()) {
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	1547 DtoDeclareClassInfo(cd->baseClass);
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	1548 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	1549 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	1550 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	1551 }
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	1552 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	1553 // null
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1554 c = LLConstant::getNullValue(DtoType(cinfo->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	1555 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	1556 }
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1557
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1558 // destructor
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1559 if (cd->isInterfaceDeclaration())
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1560 c = LLConstant::getNullValue(voidPtr);
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1561 else
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1562 c = build_class_dtor(cd);
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1563 inits.push_back(c);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1564
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1565 // invariant
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1566 VarDeclaration* invVar = (VarDeclaration*)cinfo->fields.data[6];
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1567 const LLType* invTy = DtoType(invVar->type);
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1568 if (cd->inv)
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1569 {
327 781af50846b2 [svn r348] Switch on class invariants (except in release mode). ChristianK parents: 315 diff changeset	1570 DtoForceDeclareDsymbol(cd->inv);
781af50846b2 [svn r348] Switch on class invariants (except in release mode). ChristianK parents: 315 diff changeset	1571 c = cd->inv->ir.irFunc->func;
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1572 c = DtoBitCast(c, invTy);
327 781af50846b2 [svn r348] Switch on class invariants (except in release mode). ChristianK parents: 315 diff changeset	1573 }
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1574 else
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1575 c = LLConstant::getNullValue(invTy);
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1576 inits.push_back(c);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1577
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1578 // uint flags
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1579 if (cd->isInterfaceDeclaration())
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1580 c = DtoConstUint(0);
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1581 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	1582 unsigned flags = build_classinfo_flags(cd);
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1583 c = DtoConstUint(flags);
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1584 }
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1585 inits.push_back(c);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1586
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	1587 // deallocator
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1588 if (cd->aggDelete)
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1589 {
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	1590 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	1591 c = cd->aggDelete->ir.irFunc->func;
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1592 c = DtoBitCast(c, voidPtr);
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	1593 }
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1594 else
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1595 c = LLConstant::getNullValue(voidPtr);
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1596 inits.push_back(c);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1597
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1598 // offset typeinfo
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1599 VarDeclaration* offTiVar = (VarDeclaration*)cinfo->fields.data[9];
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1600 const LLType* offTiTy = DtoType(offTiVar->type);
821 8f0b24bc55f0 Added CMake option to disable generation of ClassInfo.offTi arrays, defaults to OFF. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 816 diff changeset	1601
8f0b24bc55f0 Added CMake option to disable generation of ClassInfo.offTi arrays, defaults to OFF. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 816 diff changeset	1602 #if GENERATE_OFFTI
8f0b24bc55f0 Added CMake option to disable generation of ClassInfo.offTi arrays, defaults to OFF. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 816 diff changeset	1603
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1604 if (cd->isInterfaceDeclaration())
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1605 c = LLConstant::getNullValue(offTiTy);
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1606 else
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1607 c = build_offti_array(cd, offTiTy);
821 8f0b24bc55f0 Added CMake option to disable generation of ClassInfo.offTi arrays, defaults to OFF. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 816 diff changeset	1608
8f0b24bc55f0 Added CMake option to disable generation of ClassInfo.offTi arrays, defaults to OFF. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 816 diff changeset	1609 #else // GENERATE_OFFTI
8f0b24bc55f0 Added CMake option to disable generation of ClassInfo.offTi arrays, defaults to OFF. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 816 diff changeset	1610
8f0b24bc55f0 Added CMake option to disable generation of ClassInfo.offTi arrays, defaults to OFF. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 816 diff changeset	1611 c = LLConstant::getNullValue(offTiTy);
8f0b24bc55f0 Added CMake option to disable generation of ClassInfo.offTi arrays, defaults to OFF. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 816 diff changeset	1612
8f0b24bc55f0 Added CMake option to disable generation of ClassInfo.offTi arrays, defaults to OFF. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 816 diff changeset	1613 #endif // GENERATE_OFFTI
8f0b24bc55f0 Added CMake option to disable generation of ClassInfo.offTi arrays, defaults to OFF. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 816 diff changeset	1614
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1615 inits.push_back(c);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1616
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1617 // default constructor
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1618 if (cd->defaultCtor)
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1619 {
111 a7ae554ce4f4 [svn r115] Implemented the ClassInfo.defaultConstructor member. lindquist parents: 110 diff changeset	1620 DtoForceDeclareDsymbol(cd->defaultCtor);
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	1621 c = isaConstant(cd->defaultCtor->ir.irFunc->func);
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1622 c = DtoBitCast(c, voidPtr);
111 a7ae554ce4f4 [svn r115] Implemented the ClassInfo.defaultConstructor member. lindquist parents: 110 diff changeset	1623 }
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1624 else
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1625 c = LLConstant::getNullValue(voidPtr);
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1626 inits.push_back(c);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1627
758 f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 737 diff changeset	1628 #if DMDV2
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 737 diff changeset	1629
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 737 diff changeset	1630 // xgetMembers
809 69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1631 VarDeclaration* xgetVar = (VarDeclaration*)cinfo->fields.data[11];
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1632 const LLType* xgetTy = DtoType(xgetVar->type);
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1633
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1634 // FIXME: fill it out!
69a5e4a6fc0f Changed some hardcoded offset/alignment for classes in DMD, broke offsets for 64bits. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 806 diff changeset	1635 inits.push_back( LLConstant::getNullValue(xgetTy) );
758 f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 737 diff changeset	1636 #endif
f04dde6e882c Added initial D2 support, D2 frontend and changes to codegen to make things compile. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 737 diff changeset	1637
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1638 /*size_t n = inits.size();
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1639 for (size_t i=0; i<n; ++i)
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1640 {
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1641 Logger::cout() << "inits[" << i << "]: " << *inits[i] << '\n';
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1642 }*/
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1643
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1644 // build the initializer
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1645 LLConstant* finalinit = llvm::ConstantStruct::get(inits);
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1646 //Logger::cout() << "built the classinfo initializer:\n" << *finalinit <<'\n';
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1647 ir->constClassInfo = finalinit;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1648
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1649 // refine the type
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1650 llvm::cast<llvm::OpaqueType>(ir->classInfoOpaque.get())->refineAbstractTypeTo(finalinit->getType());
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1651
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1652 // apply initializer
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1653 ir->classInfo->setInitializer(finalinit);
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1654 }

Mercurial > projects > ldc

annotate gen/classes.cpp @ 1047:6bb04dbee21f