projects/ldc: gen/classes.cpp annotate

annotate gen/classes.cpp @ 833:482cd74d1c71

Add all base interfaces to interfaceMap, not just direct parents. Removed some superfluous 'static'.

author	Christian Kamm <kamm incasoftware de>
date	Sun, 07 Dec 2008 16:43:20 +0100
parents	a70ddd449e7d
children	3afe9f276db7

rev	line source
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1 #include <sstream>
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	2 #include "gen/llvm.h"
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	3
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	4 #include "mtype.h"
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	5 #include "aggregate.h"
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	6 #include "init.h"
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	7 #include "declaration.h"
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	8
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	9 #include "gen/irstate.h"
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	10 #include "gen/tollvm.h"
244 a95056b3c996 [svn r261] Fixed debug info for integer and floating local variables, can now be inspected in GDB. lindquist parents: 217 diff changeset	11 #include "gen/llvmhelpers.h"
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	12 #include "gen/arrays.h"
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	13 #include "gen/logger.h"
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	14 #include "gen/classes.h"
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	15 #include "gen/structs.h"
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	16 #include "gen/functions.h"
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	17 #include "gen/runtime.h"
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	18 #include "gen/dvalue.h"
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	19
136 0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	20 #include "ir/irstruct.h"
0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	21
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	22 //////////////////////////////////////////////////////////////////////////////////////////
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	23
833 482cd74d1c71 Add all base interfaces to interfaceMap, not just direct parents. Christian Kamm <kamm incasoftware de> parents: 825 diff changeset	24 // adds the base interfaces of b and the given iri to IrStruct's interfaceMap
482cd74d1c71 Add all base interfaces to interfaceMap, not just direct parents. Christian Kamm <kamm incasoftware de> parents: 825 diff changeset	25 void add_base_interfaces(IrStruct* to, IrInterface* iri, BaseClass* b)
482cd74d1c71 Add all base interfaces to interfaceMap, not just direct parents. Christian Kamm <kamm incasoftware de> parents: 825 diff changeset	26 {
482cd74d1c71 Add all base interfaces to interfaceMap, not just direct parents. Christian Kamm <kamm incasoftware de> parents: 825 diff changeset	27 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	28 {
482cd74d1c71 Add all base interfaces to interfaceMap, not just direct parents. Christian Kamm <kamm incasoftware de> parents: 825 diff changeset	29 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	30 // add to map
482cd74d1c71 Add all base interfaces to interfaceMap, not just direct parents. Christian Kamm <kamm incasoftware de> parents: 825 diff changeset	31 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	32 {
482cd74d1c71 Add all base interfaces to interfaceMap, not just direct parents. Christian Kamm <kamm incasoftware de> parents: 825 diff changeset	33 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	34 }
482cd74d1c71 Add all base interfaces to interfaceMap, not just direct parents. Christian Kamm <kamm incasoftware de> parents: 825 diff changeset	35 // add base interfaces
482cd74d1c71 Add all base interfaces to interfaceMap, not just direct parents. Christian Kamm <kamm incasoftware de> parents: 825 diff changeset	36 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	37 }
482cd74d1c71 Add all base interfaces to interfaceMap, not just direct parents. Christian Kamm <kamm incasoftware de> parents: 825 diff changeset	38 }
482cd74d1c71 Add all base interfaces to interfaceMap, not just direct parents. Christian Kamm <kamm incasoftware de> parents: 825 diff changeset	39
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	40 // 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	41 // functions required to implement b (it reimplements b)
833 482cd74d1c71 Add all base interfaces to interfaceMap, not just direct parents. Christian Kamm <kamm incasoftware de> parents: 825 diff changeset	42 void add_interface(ClassDeclaration* target, BaseClass* b, int newinstance)
137 ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	43 {
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	44 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	45 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	46
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	47 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	48 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	49
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	50 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	51 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	52 assert(irstruct);
137 ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	53
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	54 // 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	55 // 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	56 // 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	57 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	58 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	59 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	60 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	61 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	62 }
142 a123dca8349b [svn r146] fixed some potential problems with mismatch in order of interfaces in class data layout lindquist parents: 138 diff changeset	63
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	64 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	65 // 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	66 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	67 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	68 else
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	69 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	70
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	71 // 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	72 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	73
816 7d16ce7ad19d Made ClassInfo.interfaces generation consistent with DMD, fixes #134 Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 812 diff changeset	74 // 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	75 if (newinstance)
7d16ce7ad19d Made ClassInfo.interfaces generation consistent with DMD, fixes #134 Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 812 diff changeset	76 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	77
833 482cd74d1c71 Add all base interfaces to interfaceMap, not just direct parents. Christian Kamm <kamm incasoftware de> parents: 825 diff changeset	78 // 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	79 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	80
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	81 // 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	82 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	83
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	84 // 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	85 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	86 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	87 // 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	88 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	89 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	90
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	91 //////////////////////////////////////////////////////////////////////////////////////////
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	92
833 482cd74d1c71 Add all base interfaces to interfaceMap, not just direct parents. Christian Kamm <kamm incasoftware de> parents: 825 diff changeset	93 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	94 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	95 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	96 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	97
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	98 // 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	99 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	100 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	101 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	102 //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	103 }
142 a123dca8349b [svn r146] fixed some potential problems with mismatch in order of interfaces in class data layout lindquist parents: 138 diff changeset	104
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	105 // 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	106 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	107 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	108 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	109 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	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
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	112 // 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	113 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	114 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	115 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	116 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	117 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	118 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	119 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	120 // 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	121 add_interface(target, b, (cd == target));
137 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 //////////////////////////////////////////////////////////////////////////////////////////
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	127
833 482cd74d1c71 Add all base interfaces to interfaceMap, not just direct parents. Christian Kamm <kamm incasoftware de> parents: 825 diff changeset	128 void DtoResolveInterface(InterfaceDeclaration* cd)
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	129 {
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	130 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	131 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	132
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	133 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	134 LOG_SCOPE;
137 ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	135
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	136 // 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	137 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	138 TypeClass* ts = (TypeClass*)cd->type;
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	139
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	140 // 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	141 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	142 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	143 cd->ir.irStruct = irstruct;
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	144
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	145 // 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	146 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	147 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	148 Logger::println("num baseclasses: %u", cd->baseclasses.dim);
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	149 LOG_SCOPE;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	150
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	151 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	152 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	153 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	154 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	155
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	156 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	157 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	158
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	159 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	160
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	161 // 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	162 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	163 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	164 irstruct->classInfoInterfaces.push_back(iri);
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	165 }
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	166 }
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	167
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	168 // 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	169 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	170 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	171 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	172
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	173 // 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	174 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	175
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	176 // 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	177 // 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	178 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	179 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	180 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	181 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	182 }
100 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 //////////////////////////////////////////////////////////////////////////////////////////
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	186
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	187 // 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	188
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	189 void DtoResolveClass(ClassDeclaration* cd)
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	190 {
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	191 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	192 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	193 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	194 return;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	195 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	196
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	197 if (cd->ir.resolved) return;
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	198 cd->ir.resolved = true;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	199
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	200 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	201 LOG_SCOPE;
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	202
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	203 //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	204
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	205 // get the TypeClass
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	206 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	207 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	208
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	209 // 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	210 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	211 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	212 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	213
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	214 // 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	215 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	216
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 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	218 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	219 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	220 // 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	221 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	222 return;
133 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
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	225 // 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	226 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	227 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	228 }
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	229
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	230 // push state
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	231 gIR->structs.push_back(irstruct);
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	232
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	233 // 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	234 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	235 irstruct->index++;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	236
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	237 // 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	238 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	239 irstruct->index++;
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	240
797 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 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	242 add_class_data(cd, cd);
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	243
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	244 // 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	245 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	246 fatal();
137 ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	247
ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	248 // 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	249 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	250 const LLType* structtype = irstruct->build();
137 ce7b81fb957f [svn r141] fixed more problems with classinfo lindquist parents: 136 diff changeset	251
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	252 // 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	253 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	254 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	255 structtype = isaStruct(spa->get());
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	256
123 7f9a0a58394b [svn r127] Updated the lphobos build scripts a little. Created a new rebuild profile. lindquist parents: 121 diff changeset	257 // name the type
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	258 gIR->module->addTypeName(cd->mangle(), ts->ir.type->get());
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	259
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	260 // refine vtable type
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	261
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	262 // 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	263 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	264
aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	265 // 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	266 // 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	267 // 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	268
aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	269 // 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	270 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	271
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	272 // 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	273 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	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
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	276 //////////////////////////////////////////////////////////////////////////////////////////
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	277
833 482cd74d1c71 Add all base interfaces to interfaceMap, not just direct parents. Christian Kamm <kamm incasoftware de> parents: 825 diff changeset	278 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	279 {
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	280 if (cd->ir.declared) return;
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	281 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	282
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	283 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	284 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	285
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	286 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	287 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	288
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	289 // 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	290 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	291
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	292 // 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	293 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	294 // 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	295 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	296 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	297 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	298
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	299 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	300
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	301 // 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	302 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	303 // 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	304 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	305
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	306 // 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	307 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	308 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	309 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	310 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	311 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	312 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	313
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	314 // 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	315 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	316 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	317 idx++;
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
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	321 // 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	322 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	323
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	324 // 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	325 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	326
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	327 // emit typeinfo and request definition
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	328 if (cd->getModule() == gIR->dmodule \|\| DtoIsTemplateInstance(cd))
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	329 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	330 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	331 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	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
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	337 // 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	338
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	339 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	340 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	341 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	342 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	343 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	344 return;
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
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	347 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	348 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	349
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	350 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	351 LOG_SCOPE;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	352
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	353 //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	354
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	355 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	356 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	357
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	358 assert(cd->ir.irStruct);
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	359 IrStruct* irstruct = cd->ir.irStruct;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	360
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	361 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	362
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	363 bool needs_definition = false;
147 0636f6269dfd [svn r152] Relates to ticket #34. Always emit class definition if it is a template instance. Linkage still needs to be fixed. ChristianK parents: 142 diff changeset	364 if (cd->getModule() == gIR->dmodule \|\| DtoIsTemplateInstance(cd)) {
123 7f9a0a58394b [svn r127] Updated the lphobos build scripts a little. Created a new rebuild profile. lindquist parents: 121 diff changeset	365 needs_definition = true;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	366 }
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	367
149 4c577c2b7229 [svn r155] Fixed a bunch of linkage problems (especially with templates) lindquist parents: 147 diff changeset	368 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	369
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	370 // 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	371 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	372 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	373 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	374 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	375
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	376 // 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	377 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	378
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	379 // 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	380 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	381 // 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	382 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	383 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	384 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	385 // 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	386 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	387 // 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	388 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	389 }
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	390
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	391 // 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	392
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	393 // 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	394 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	395 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	396 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	397 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	398 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	399
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	400 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	401 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	402 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	403 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	404 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	405
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	406 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	407
816 7d16ce7ad19d Made ClassInfo.interfaces generation consistent with DMD, fixes #134 Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 812 diff changeset	408 // 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	409 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	410 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	411 idx++;
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	412 }
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	413
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	414 // 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	415 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	416 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	417 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	418
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	419 // 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	420 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	421 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	422
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	423 gIR->structs.pop_back();
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	424
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	425 // 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	426 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	427
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	428 // define ? (set initializers)
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	429 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	430 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	431
855adfdb8d38 [svn r107] Getting .classinfo on a class instance now works (classinfo is stored in vtable) lindquist parents: 102 diff changeset	432 // classinfo
855adfdb8d38 [svn r107] Getting .classinfo on a class instance now works (classinfo is stored in vtable) lindquist parents: 102 diff changeset	433 DtoDeclareClassInfo(cd);
106 5b5194b25f33 [svn r110] Fixed typeinfo for classes. lindquist parents: 103 diff changeset	434
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	435 // do typeinfo ?
123 7f9a0a58394b [svn r127] Updated the lphobos build scripts a little. Created a new rebuild profile. lindquist parents: 121 diff changeset	436 if (needs_definition)
275 665b81613475 [svn r296] Removed: the 'suite' dir, it never took off! lindquist parents: 271 diff changeset	437 DtoTypeInfoOf(cd->type, false);
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	438 }
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	439
797 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
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	442 // adds data fields and interface vtables to the constant initializer of class cd
833 482cd74d1c71 Add all base interfaces to interfaceMap, not just direct parents. Christian Kamm <kamm incasoftware de> parents: 825 diff changeset	443 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	444 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	445 // 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	446 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	447 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	448 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	449 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	450
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	451 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	452 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	453
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	454 // 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	455 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	456 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	457
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	458 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	459 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	460
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	461 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	462 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	463
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	464 // 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	465 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	466 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	467 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	468 // 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	469 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	470 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	471 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	472 {
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	473 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	474 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	475 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	476 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	477 }
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	478 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	479 {
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	480 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	481 }
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	482 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	483
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	484 // 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	485 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	486 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	487
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	488 // 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	489 // 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	490 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	491 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	492 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	493 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	494
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	495 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	496
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	497 // 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	498 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	499 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	500
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	501 // 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	502 // 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	503 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	504 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	505 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	506 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	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
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	509 // 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	510 // 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	511 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	512 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	513 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	514
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	515 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	516 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	517 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	518
806 96b404ba7eb0 Move storage of final vtbl from BaseClass to IrInterface: BaseClass instances are shared! Christian Kamm <kamm incasoftware de> parents: 805 diff changeset	519 // 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	520 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	521
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	522 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	523 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	524 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	525 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	526 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	527 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	528
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	529 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	530 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	531 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	532 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	533 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	534
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	535 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	536 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	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
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 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	540 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	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
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	545 // build the vtable initializer for class cd
833 482cd74d1c71 Add all base interfaces to interfaceMap, not just direct parents. Christian Kamm <kamm incasoftware de> parents: 825 diff changeset	546 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	547 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	548 // 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	549 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	550
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	551 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	552
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	553 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	554
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	555 // 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	556 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	557 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	558
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	559 // 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	560 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	561 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	562 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	563 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	564
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	565 // 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	566
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	567 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	568 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	569
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	570 // 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	571 // 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	572 // 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	573 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	574 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	575 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	576 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	577 else
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	578 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	579 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	580 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	581 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	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
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	584 // 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	585 // 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	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
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	588 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	589
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	590 // 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	591 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	592
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	593 // 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	594 // 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	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 //////////////////////////////////////////////////////////////////////////////
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	598
833 482cd74d1c71 Add all base interfaces to interfaceMap, not just direct parents. Christian Kamm <kamm incasoftware de> parents: 825 diff changeset	599 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	600 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	601 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	602
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	603 // 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	604 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	605 return;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	606
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*> inits;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	608 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	609
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	610 // 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	611 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	612 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	613 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	614 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	615 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	616
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	617 // 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	618 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	619 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	620
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	621 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	622 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	623 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	624
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	625 // 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	626 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	627 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	628
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	629 // 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	630 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	631 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	632 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	633 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	634 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	635 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	636 continue;
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
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	639 //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	640
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	641 // 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	642 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	643 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	644
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	645 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	646 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	647 else
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	648 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	649 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	650
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	651 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	652 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	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
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	655 //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	656 // 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	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
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	659 // 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	660 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	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
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	663 // 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	664 // 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	665
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	666 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	667
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	668 // classinfo
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	669 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	670 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	671 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	672 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	673
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	674 // vtbl
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	675 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	676 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	677 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	678 else
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	679 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	680 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	681
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	682 // offset
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	683 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	684 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	685 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	686 else
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	687 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	688
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	689 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	690 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	691 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	692
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	693 // 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	694 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	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 //////////////////////////////////////////////////////////////////////////////
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	699
833 482cd74d1c71 Add all base interfaces to interfaceMap, not just direct parents. Christian Kamm <kamm incasoftware de> parents: 825 diff changeset	700 void DtoConstInitInterface(InterfaceDeclaration* cd)
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	701 {
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	702 if (cd->ir.initialized) return;
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	703 cd->ir.initialized = true;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	704
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	705 Logger::println("DtoConstInitClass(%s): %s", cd->toPrettyChars(), cd->loc.toChars());
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	706 LOG_SCOPE;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	707
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	708 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	709 }
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	710
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	711 //////////////////////////////////////////////////////////////////////////////
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	712
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	713 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	714 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	715 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	716 {
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	717 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	718 return;
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	719 }
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	720
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	721 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	722 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	723
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	724 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	725 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	726
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	727 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	728
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	729 // 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	730 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	731 DtoForceConstInitDsymbol(cd->baseClass);
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	732
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	733 // 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	734 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	735 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	736
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	737 // 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	738 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	739 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	740 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	741 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	742 assert(vtbltype);
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	743
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	744 // 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	745 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	746 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	747
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	748 // 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	749 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	750 inits.push_back(irstruct->vtbl);
423 3424f0fab7a9 Error instead of assert on unimplemented interface functions. Christian Kamm <kamm incasoftware de> parents: 422 diff changeset	751
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	752 // 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	753 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	754
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	755 // 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	756 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	757
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	758 // 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	759 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	760
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	761 // 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	762 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	763
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	764 // 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	765 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	766 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	767
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	768 // 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	769 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	770
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	771 // 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	772 // {
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() << "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	774 // 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	775 // 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	776 // }
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	777
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	778 gIR->structs.pop_back();
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 //////////////////////////////////////////////////////////////////////////////////////////
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	782
833 482cd74d1c71 Add all base interfaces to interfaceMap, not just direct parents. Christian Kamm <kamm incasoftware de> parents: 825 diff changeset	783 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	784 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	785 // 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	786 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	787
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 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	789 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	790
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	791 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	792 {
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	793 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	794 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	795 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	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
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	798 // 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	799 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	800 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	801 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	802 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	803 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	804 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	805 else
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	806 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	807 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	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 //////////////////////////////////////////////////////////////////////////////////////////
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	812
833 482cd74d1c71 Add all base interfaces to interfaceMap, not just direct parents. Christian Kamm <kamm incasoftware de> parents: 825 diff changeset	813 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	814 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	815 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	816 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	817
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	818 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	819 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	820
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	821 // 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	822 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	823
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	824 // define 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	825 if (cd->getModule() == gIR->dmodule \|\| DtoIsTemplateInstance(cd))
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	826 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	827 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	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
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	833 // 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	834
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	835 void DtoDefineClass(ClassDeclaration* cd)
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	836 {
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	837 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	838 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	839 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	840 return;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	841 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	842
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	843 if (cd->ir.defined) return;
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	844 cd->ir.defined = true;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	845
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	846 Logger::println("DtoDefineClass(%s): %s", cd->toPrettyChars(), cd->loc.toChars());
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	847 LOG_SCOPE;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	848
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	849 // get the struct (class) type
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	850 assert(cd->type->ty == Tclass);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	851 TypeClass* ts = (TypeClass*)cd->type;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	852
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	853 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	854
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	855 assert(cd->getModule() == gIR->dmodule \|\| DtoIsTemplateInstance(cd));
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	856
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	857 // 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	858 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	859 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	860 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	861 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	862
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	863 // 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	864 // {
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() << "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	866 // 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	867 // 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	868 // 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	869 // }
177 cea8dcfa76df [svn r193] Fixed: abstract classes implementing interfaces now output proper Interface info arrays. (null vtables). lindquist parents: 173 diff changeset	870
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	871 // 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	872 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	873 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	874
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	875 // 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	876 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	877 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	878 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	879 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	880 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	881 assert(iri->vtblInit);
123 7f9a0a58394b [svn r127] Updated the lphobos build scripts a little. Created a new rebuild profile. lindquist parents: 121 diff changeset	882
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	883 // 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	884 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	885
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	886 // 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	887 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	888 iri->vtbl->setInitializer(iri->vtblInit);
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	889 }
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	890
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	891 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	892
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	893 // 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	894 DtoDefineClassInfo(cd);
100 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 //////////////////////////////////////////////////////////////////////////////////////////
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	898
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	899 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	900 {
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	901 // resolve type
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	902 DtoForceDeclareDsymbol(tc->sym);
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	903
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	904 // allocate
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	905 LLValue* mem;
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	906 if (newexp->onstack)
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	907 {
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	908 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	909 }
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	910 // 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	911 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	912 {
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	913 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	914 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	915 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	916 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	917 }
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	918 // default allocator
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	919 else
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	920 {
728 635f91212b78 Change _d_newclass into _d_allocclass. Add initialization to ClassInfo.create. Christian Kamm <kamm incasoftware de> parents: 705 diff changeset	921 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	922 LLConstant* ci = DtoBitCast(tc->sym->ir.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	923 mem = gIR->CreateCallOrInvoke(fn, ci, ".newclass_gc_alloc")->get();
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	924 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	925 }
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	926
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	927 // init
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	928 DtoInitClass(tc, mem);
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	929
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	930 // 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	931 if (newexp->thisexp)
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	932 {
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	933 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	934 LOG_SCOPE;
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	935 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	936 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	937 LLValue* src = thisval->getRVal();
7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	938 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	939 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	940 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	941 DtoStore(src, dst);
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	942 }
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	943 // 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	944 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	945 {
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	946 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	947 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	948
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	949 // 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	950 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	951
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	952 // 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	953 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	954 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	955 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	956 }
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	957
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	958 // call constructor
160 b77664331d06 [svn r176] Fixed a bug with class constructors. lindquist parents: 157 diff changeset	959 if (newexp->member)
b77664331d06 [svn r176] Fixed a bug with class constructors. lindquist parents: 157 diff changeset	960 {
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
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	977 size_t presz = 2*getABITypeSize(DtoSize_t());
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	978 uint64_t n = getABITypeSize(tc->ir.type->get()) - presz;
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	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();
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1062 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	1063 // 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	1064 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	1065 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	1066 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	1067 // 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	1068 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	1069 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	1070 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	1071 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1072 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	1073 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	1074 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1075 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	1076 // 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	1077 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	1078 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1079 // class -> interface
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1080 else {
138 aeddd4d533b3 [svn r142] minor fix to dynamic casts. lindquist parents: 137 diff changeset	1081 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	1082 return DtoDynamicCastObject(val, _to);
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1083 }
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1084 }
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1085 // x -> class
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1086 else {
778 4adf0f742896 Get rid of DtoBoolean - use DtoCast(... Type::tbool) instead. Christian Kamm <kamm incasoftware de> parents: 758 diff changeset	1087 Logger::println("to class");
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1088 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	1089 // interface -> class
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1090 if (fc->sym->isInterfaceDeclaration()) {
138 aeddd4d533b3 [svn r142] minor fix to dynamic casts. lindquist parents: 137 diff changeset	1091 Logger::println("interface cast");
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1092 return DtoCastInterfaceToObject(val, _to);
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1093 }
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1094 // 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	1095 else if (tc->sym->isBaseOf(fc->sym,NULL)) {
138 aeddd4d533b3 [svn r142] minor fix to dynamic casts. lindquist parents: 137 diff changeset	1096 Logger::println("static down cast)");
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	1097 const LLType* tolltype = DtoType(_to);
7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	1098 LLValue* rval = DtoBitCast(val->getRVal(), tolltype);
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1099 return new DImValue(_to, rval);
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1100 }
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1101 // class -> class - dynamic up cast
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1102 else {
138 aeddd4d533b3 [svn r142] minor fix to dynamic casts. lindquist parents: 137 diff changeset	1103 Logger::println("dynamic up cast");
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1104 return DtoDynamicCastObject(val, _to);
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1105 }
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 DValue* DtoDynamicCastObject(DValue* val, Type* _to)
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1112 {
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1113 // call:
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1114 // Object _d_dynamic_cast(Object o, ClassInfo c)
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1115
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1116 DtoForceDeclareDsymbol(ClassDeclaration::object);
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1117 DtoForceDeclareDsymbol(ClassDeclaration::classinfo);
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1118
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1119 llvm::Function* func = LLVM_D_GetRuntimeFunction(gIR->module, "_d_dynamic_cast");
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1120 const llvm::FunctionType* funcTy = func->getFunctionType();
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1121
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	1122 std::vector<LLValue*> args;
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1123
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1124 // Object o
217 0806379a5eca [svn r233] Added: -oq command line option for writing fully qualified object names. lindquist parents: 213 diff changeset	1125 LLValue* obj = val->getRVal();
0806379a5eca [svn r233] Added: -oq command line option for writing fully qualified object names. lindquist parents: 213 diff changeset	1126 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	1127 assert(funcTy->getParamType(0) == obj->getType());
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1128
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1129 // 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	1130 TypeClass* to = (TypeClass*)_to->toBasetype();
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1131 DtoForceDeclareDsymbol(to->sym);
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	1132 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	1133 LLValue* cinfo = to->sym->ir.irStruct->classInfo;
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1134 // 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	1135 // 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	1136 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	1137 assert(funcTy->getParamType(1) == cinfo->getType());
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1138
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1139 // call it
315 a9697749e898 [svn r336] Made sure calls within a landing pad area are invokes. ChristianK parents: 309 diff changeset	1140 LLValue* ret = gIR->CreateCallOrInvoke2(func, obj, cinfo, "tmp")->get();
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1141
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1142 // cast return value
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1143 ret = DtoBitCast(ret, DtoType(_to));
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1144
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1145 return new DImValue(_to, ret);
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1146 }
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
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1150 DValue* DtoCastInterfaceToObject(DValue* val, Type* to)
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1151 {
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1152 // call:
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1153 // Object _d_toObject(void* p)
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1154
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1155 llvm::Function* func = LLVM_D_GetRuntimeFunction(gIR->module, "_d_toObject");
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1156 const llvm::FunctionType* funcTy = func->getFunctionType();
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1157
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1158 // void* p
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	1159 LLValue* tmp = val->getRVal();
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1160 tmp = DtoBitCast(tmp, funcTy->getParamType(0));
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1161
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1162 // call it
315 a9697749e898 [svn r336] Made sure calls within a landing pad area are invokes. ChristianK parents: 309 diff changeset	1163 LLValue* ret = gIR->CreateCallOrInvoke(func, tmp, "tmp")->get();
114 5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1164
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1165 // cast return value
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1166 if (to != NULL)
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1167 ret = DtoBitCast(ret, DtoType(to));
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1168 else
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1169 to = ClassDeclaration::object->type;
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1170
5880c12dba83 [svn r118] Fixed dynamic casts. lindquist parents: 113 diff changeset	1171 return new DImValue(to, ret);
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1172 }
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
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1176 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	1177 {
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1178 // call:
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1179 // 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	1180
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1181 DtoForceDeclareDsymbol(ClassDeclaration::object);
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1182 DtoForceDeclareDsymbol(ClassDeclaration::classinfo);
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1183
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1184 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	1185 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	1186
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	1187 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	1188
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1189 // void* p
217 0806379a5eca [svn r233] Added: -oq command line option for writing fully qualified object names. lindquist parents: 213 diff changeset	1190 LLValue* ptr = val->getRVal();
0806379a5eca [svn r233] Added: -oq command line option for writing fully qualified object names. lindquist parents: 213 diff changeset	1191 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	1192
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1193 // 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	1194 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	1195 DtoForceDeclareDsymbol(to->sym);
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	1196 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	1197 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	1198 // 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	1199 // 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	1200 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	1201
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1202 // call it
315 a9697749e898 [svn r336] Made sure calls within a landing pad area are invokes. ChristianK parents: 309 diff changeset	1203 LLValue* ret = gIR->CreateCallOrInvoke2(func, ptr, cinfo, "tmp")->get();
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1204
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1205 // cast return value
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1206 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	1207
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1208 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	1209 }
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
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	1213 LLValue* DtoIndexClass(LLValue* src, ClassDeclaration* cd, VarDeclaration* vd)
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1214 {
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	1215 Logger::println("indexing class field %s:", vd->toPrettyChars());
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1216 LOG_SCOPE;
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1217
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	1218 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	1219 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	1220
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 // 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	1222 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	1223 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	1224
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1225 // get the start pointer
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	1226 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	1227 // 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	1228 src = DtoBitCast(src, st);
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1229
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1230 // 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	1231 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	1232 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1233 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	1234 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	1235 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	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 LLValue* val = DtoGEPi(src, 0, field->index);
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1238
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1239 // 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	1240 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	1241 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1242 // 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	1243 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	1244 // offset
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1245 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	1246 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1247
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1248 // 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	1249 val = DtoBitCast(val, getPtrToType(DtoType(vd->type)));
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1250
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	1251 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	1252 Logger::cout() << "value: " << *val << '\n';
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1253
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	1254 return val;
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1255 }
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1256
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1257 //////////////////////////////////////////////////////////////////////////////////////////
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 123 diff changeset	1258
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	1259 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	1260 {
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	1261 // 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	1262 assert(fdecl->isVirtual());
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	1263 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	1264 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	1265
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	1266 // get instance
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	1267 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	1268 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	1269 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	1270
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1271 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	1272 // 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	1273 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	1274 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	1275 // load vtbl ptr
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1276 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	1277 // 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	1278 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	1279 // load funcptr
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1280 funcval = DtoLoad(funcval);
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1281
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	1282 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	1283 Logger::cout() << "funcval: " << *funcval << '\n';
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	1284
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	1285 // cast to final funcptr type
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	1286 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	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 casted: " << *funcval << '\n';
193 aca17e55b7a5 [svn r209] Fixed: exotic array to pointer casts were broken. lindquist parents: 192 diff changeset	1289
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1290 return funcval;
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1291 }
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1292
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1293 //////////////////////////////////////////////////////////////////////////////////////////
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	1294
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1295 void DtoDeclareClassInfo(ClassDeclaration* cd)
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1296 {
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1297 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	1298
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1299 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	1300 irstruct->classInfoDeclared = true;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1301
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	1302 Logger::println("DtoDeclareClassInfo(%s)", cd->toChars());
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1303 LOG_SCOPE;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1304
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	1305 // resovle ClassInfo
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1306 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	1307 DtoResolveClass(cinfo);
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1308
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	1309 // do the mangle
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1310 std::string gname("_D");
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1311 gname.append(cd->mangle());
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1312 if (!cd->isInterfaceDeclaration())
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1313 gname.append("7__ClassZ");
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1314 else
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1315 gname.append("11__InterfaceZ");
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1316
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	1317 // 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	1318 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	1319 }
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1320
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	1321 //////////////////////////////////////////////////////////////////////////////////////////
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
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	1323 #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	1324
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	1325 // build a single element for the OffsetInfo[] of ClassInfo
833 482cd74d1c71 Add all base interfaces to interfaceMap, not just direct parents. Christian Kamm <kamm incasoftware de> parents: 825 diff changeset	1326 LLConstant* build_offti_entry(ClassDeclaration* cd, VarDeclaration* vd)
110 e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1327 {
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	1328 std::vector<LLConstant*> inits(2);
110 e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 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 // 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	1331 //
271 1e6e2b5d5bfe [svn r292] Fixed: string switch was broken in several ways. lindquist parents: 268 diff changeset	1332 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	1333 // 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	1334 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	1335 // 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	1336 offset += vd->ir.irField->unionOffset;
110 e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1337
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 // 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	1339 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	1340 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	1341
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	1342 inits[0] = DtoConstSize_t(offset);
110 e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1343
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	1344 // 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	1345 inits[1] = DtoTypeInfoOf(vd->type, true);
110 e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1346
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	1347 // 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	1348 return llvm::ConstantStruct::get(inits);
110 e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1349 }
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1350
833 482cd74d1c71 Add all base interfaces to interfaceMap, not just direct parents. Christian Kamm <kamm incasoftware de> parents: 825 diff changeset	1351 LLConstant* build_offti_array(ClassDeclaration* cd, const LLType* arrayT)
110 e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1352 {
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	1353 IrStruct* irstruct = cd->ir.irStruct;
110 e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1354
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	1355 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	1356 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	1357
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1358 for (size_t i=0; i<nvars; i++)
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 arrayInits[i] = build_offti_entry(cd, irstruct->varDecls[i]);
110 e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1361 }
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1362
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	1363 LLConstant* size = DtoConstSize_t(nvars);
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	1364 LLConstant* ptr;
110 e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1365
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	1366 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	1367 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	1368
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	1369 // 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	1370 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	1371 LLConstant* arrInit = llvm::ConstantArray::get(arrTy, arrayInits);
110 e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1372
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	1373 // 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	1374 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	1375 name.append("__OffsetTypeInfos");
149 4c577c2b7229 [svn r155] Fixed a bunch of linkage problems (especially with templates) lindquist parents: 147 diff changeset	1376
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	1377 // 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	1378 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	1379 ptr = DtoBitCast(gvar, getPtrToType(arrTy->getElementType()));
110 e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1380
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1381 return DtoConstSlice(size, ptr);
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1382 }
e8da7856a260 [svn r114] Implemented the ClassInfo.offTi member. lindquist parents: 106 diff changeset	1383
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	1384 #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	1385
833 482cd74d1c71 Add all base interfaces to interfaceMap, not just direct parents. Christian Kamm <kamm incasoftware de> parents: 825 diff changeset	1386 LLConstant* build_class_dtor(ClassDeclaration* cd)
112 368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1387 {
268 23d0d9855cad [svn r289] Fixed: right shift >> was broken for unsigned types. lindquist parents: 244 diff changeset	1388 FuncDeclaration* dtor = cd->dtor;
23d0d9855cad [svn r289] Fixed: right shift >> was broken for unsigned types. lindquist parents: 244 diff changeset	1389
23d0d9855cad [svn r289] Fixed: right shift >> was broken for unsigned types. lindquist parents: 244 diff changeset	1390 // if no destructor emit a null
23d0d9855cad [svn r289] Fixed: right shift >> was broken for unsigned types. lindquist parents: 244 diff changeset	1391 if (!dtor)
23d0d9855cad [svn r289] Fixed: right shift >> was broken for unsigned types. lindquist parents: 244 diff changeset	1392 return getNullPtr(getVoidPtrType());
23d0d9855cad [svn r289] Fixed: right shift >> was broken for unsigned types. lindquist parents: 244 diff changeset	1393
23d0d9855cad [svn r289] Fixed: right shift >> was broken for unsigned types. lindquist parents: 244 diff changeset	1394 DtoForceDeclareDsymbol(dtor);
23d0d9855cad [svn r289] Fixed: right shift >> was broken for unsigned types. lindquist parents: 244 diff changeset	1395 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	1396 }
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1397
833 482cd74d1c71 Add all base interfaces to interfaceMap, not just direct parents. Christian Kamm <kamm incasoftware de> parents: 825 diff changeset	1398 unsigned build_classinfo_flags(ClassDeclaration* cd)
112 368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1399 {
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1400 // 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	1401 unsigned flags = 0;
112 368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1402 //flags \|= isCOMclass(); // IUnknown
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1403 bool hasOffTi = false;
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1404 if (cd->ctor) flags \|= 8;
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1405 for (ClassDeclaration *cd2 = cd; cd2; cd2 = cd2->baseClass)
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1406 {
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1407 if (cd2->members)
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1408 {
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1409 for (size_t i = 0; i < cd2->members->dim; i++)
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1410 {
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1411 Dsymbol sm = (Dsymbol )cd2->members->data[i];
275 665b81613475 [svn r296] Removed: the 'suite' dir, it never took off! lindquist parents: 271 diff changeset	1412 if (sm->isVarDeclaration() && !sm->isVarDeclaration()->isDataseg()) // is this enough?
112 368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1413 hasOffTi = true;
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1414 //printf("sm = %s %s\n", sm->kind(), sm->toChars());
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1415 if (sm->hasPointers())
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1416 goto L2;
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1417 }
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1418 }
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1419 }
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1420 flags \|= 2; // no pointers
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1421 L2:
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1422 if (hasOffTi)
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1423 flags \|= 4;
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1424 return flags;
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1425 }
368547b1cbe6 [svn r116] Implemented the ClassInfo.destructor field. lindquist parents: 111 diff changeset	1426
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1427 void DtoDefineClassInfo(ClassDeclaration* cd)
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1428 {
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1429 // The layout is:
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1430 // {
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1431 // void **vptr;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1432 // monitor_t monitor;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1433 // byte[] initializer; // static initialization data
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1434 // char[] name; // class name
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1435 // void *[] vtbl;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1436 // Interface[] interfaces;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1437 // ClassInfo *base; // base class
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1438 // void *destructor;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1439 // void *invariant; // class invariant
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1440 // uint flags;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1441 // void *deallocator;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1442 // OffsetTypeInfo[] offTi;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1443 // void *defaultConstructor;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1444 // }
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1445
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1446 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	1447
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1448 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	1449 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	1450
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	1451 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	1452 LOG_SCOPE;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1453
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	1454 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	1455 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	1456
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 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	1458 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	1459 {
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->init);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1461 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	1462 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	1463 assert(ir->constVtbl);
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1464 }
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1465
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1466 // 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	1467 std::vector<LLConstant*> inits;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1468
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1469 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	1470 DtoForceConstInitDsymbol(cinfo);
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1471
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 210 diff changeset	1472 LLConstant* c;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1473
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	1474 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	1475 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	1476
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1477 // 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	1478 c = cinfo->ir.irStruct->vtbl;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1479 assert(c);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1480 inits.push_back(c);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1481
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1482 // 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	1483 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	1484 inits.push_back(c);
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1485
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	1486 // 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	1487 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	1488 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	1489 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	1490 {
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	1491 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	1492 //Logger::cout() << *ir->constInit->getType() << std::endl;
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	1493 size_t initsz = getABITypeSize(ir->init->getType()->getContainedType(0));
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1494 c = DtoConstSlice(DtoConstSize_t(initsz), c);
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1495 }
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1496 inits.push_back(c);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1497
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1498 // class name
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1499 // from dmd
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1500 char *name = cd->ident->toChars();
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1501 size_t namelen = strlen(name);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1502 if (!(namelen > 9 && memcmp(name, "TypeInfo_", 9) == 0))
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1503 {
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1504 name = cd->toPrettyChars();
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1505 namelen = strlen(name);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1506 }
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1507 c = DtoConstString(name);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1508 inits.push_back(c);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1509
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1510 // 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	1511 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	1512 c = DtoConstSlice(DtoConstSize_t(0), LLConstant::getNullValue(getPtrToType(voidPtr)));
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1513 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	1514 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	1515 c = DtoConstSlice(DtoConstSize_t(cd->vtbl.dim), c);
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1516 }
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1517 inits.push_back(c);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1518
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1519 // 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	1520 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	1521 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	1522 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	1523 c = LLConstant::getNullValue(intersTy);
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1524 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	1525 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	1526 // 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	1527 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	1528 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	1529 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	1530 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	1531 // 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	1532 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	1533 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	1534 // make array
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1535 c = DtoConstSlice(DtoConstSize_t(iisz), c);
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1536 }
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1537 inits.push_back(c);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1538
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1539 // 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	1540 // 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	1541 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	1542 DtoDeclareClassInfo(cd->baseClass);
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	1543 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	1544 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	1545 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	1546 }
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 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	1548 // 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	1549 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	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 }
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1552
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1553 // 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	1554 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	1555 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	1556 else
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1557 c = build_class_dtor(cd);
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1558 inits.push_back(c);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1559
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1560 // 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	1561 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	1562 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	1563 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	1564 {
327 781af50846b2 [svn r348] Switch on class invariants (except in release mode). ChristianK parents: 315 diff changeset	1565 DtoForceDeclareDsymbol(cd->inv);
781af50846b2 [svn r348] Switch on class invariants (except in release mode). ChristianK parents: 315 diff changeset	1566 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	1567 c = DtoBitCast(c, invTy);
327 781af50846b2 [svn r348] Switch on class invariants (except in release mode). ChristianK parents: 315 diff changeset	1568 }
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	1569 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	1570 c = LLConstant::getNullValue(invTy);
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1571 inits.push_back(c);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1572
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1573 // 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	1574 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	1575 c = DtoConstUint(0);
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1576 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	1577 unsigned flags = build_classinfo_flags(cd);
113 27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1578 c = DtoConstUint(flags);
27b9f749d9fe [svn r117] Initial working implementation of interfaces. lindquist parents: 112 diff changeset	1579 }
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1580 inits.push_back(c);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1581
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	1582 // 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	1583 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	1584 {
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	1585 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	1586 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	1587 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	1588 }
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	1589 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	1590 c = LLConstant::getNullValue(voidPtr);
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1591 inits.push_back(c);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1592
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1593 // 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	1594 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	1595 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	1596
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	1597 #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	1598
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 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	1600 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	1601 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	1602 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	1603
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	1604 #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	1605
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	1606 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	1607
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 #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	1609
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1610 inits.push_back(c);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1611
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1612 // 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	1613 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	1614 {
111 a7ae554ce4f4 [svn r115] Implemented the ClassInfo.defaultConstructor member. lindquist parents: 110 diff changeset	1615 DtoForceDeclareDsymbol(cd->defaultCtor);
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 169 diff changeset	1616 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	1617 c = DtoBitCast(c, voidPtr);
111 a7ae554ce4f4 [svn r115] Implemented the ClassInfo.defaultConstructor member. lindquist parents: 110 diff changeset	1618 }
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	1619 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	1620 c = LLConstant::getNullValue(voidPtr);
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1621 inits.push_back(c);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1622
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	1623 #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	1624
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	1625 // 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	1626 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	1627 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	1628
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	1629 // 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	1630 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	1631 #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	1632
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1633 /*size_t n = inits.size();
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1634 for (size_t i=0; i<n; ++i)
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1635 {
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1636 Logger::cout() << "inits[" << i << "]: " << *inits[i] << '\n';
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1637 }*/
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1638
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1639 // 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	1640 LLConstant* finalinit = llvm::ConstantStruct::get(inits);
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1641 //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	1642 ir->constClassInfo = finalinit;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1643
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1644 // 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	1645 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	1646
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	1647 // 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	1648 ir->classInfo->setInitializer(finalinit);
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: diff changeset	1649 }

Mercurial > projects > ldc

annotate gen/classes.cpp @ 833:482cd74d1c71