Mercurial > projects > ldc
diff gen/tollvm.cpp @ 137:ce7b81fb957f trunk
[svn r141] fixed more problems with classinfo
moved more IR state out of the AST classes
| author | lindquist |
|---|---|
| date | Fri, 18 Jan 2008 16:42:16 +0100 |
| parents | 0e28624814e8 |
| children | 8f43f5c43c95 |
line wrap: on
line diff
--- a/gen/tollvm.cpp Thu Jan 17 03:15:12 2008 +0100 +++ b/gen/tollvm.cpp Fri Jan 18 16:42:16 2008 +0100 @@ -116,7 +116,7 @@ TypeStruct* ts = (TypeStruct*)t; assert(ts->sym); DtoResolveDsymbol(ts->sym); - return ts->sym->llvmIrStruct->recty.get();//t->llvmType->get(); + return ts->sym->irStruct->recty.get();//t->llvmType->get(); } case Tclass: { @@ -139,7 +139,7 @@ TypeClass* tc = (TypeClass*)t; assert(tc->sym); DtoResolveDsymbol(tc->sym); - return getPtrToType(tc->sym->llvmIrStruct->recty.get());//t->llvmType->get()); + return getPtrToType(tc->sym->irStruct->recty.get());//t->llvmType->get()); } // functions @@ -523,8 +523,8 @@ TypeStruct* ts = (TypeStruct*)t; assert(ts); assert(ts->sym); - assert(ts->sym->llvmConstInit); - _init = ts->sym->llvmConstInit; + assert(ts->sym->irStruct->constInit); + _init = ts->sym->irStruct->constInit; } else if (t->ty == Tclass) { @@ -732,7 +732,7 @@ else if (ClassDeclaration* cd = fd->toParent2()->isClassDeclaration()) { size_t idx = 2; - idx += cd->llvmIrStruct->interfaces.size(); + idx += cd->irStruct->interfaces.size(); v = DtoGEPi(v,0,idx,"tmp"); v = DtoLoad(v); } @@ -1562,8 +1562,8 @@ llvm::GlobalVariable* gv = llvm::cast<llvm::GlobalVariable>(_init); assert(t->ty == Tstruct); TypeStruct* ts = (TypeStruct*)t; - assert(ts->sym->llvmConstInit); - _init = ts->sym->llvmConstInit; + assert(ts->sym->irStruct->constInit); + _init = ts->sym->irStruct->constInit; } // array single value init else if (isaArray(_type))