mirrors/ldc
1
0
Fork 0
mirror of https://github.com/ldc-developers/ldc.git synced 2025-05-08 11:56:12 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cache result of DtoFunctionType.

Browse source
This commit is contained in:
Kai Nacke 2013-12-19 19:17:12 +01:00
parent 62137ca489
commit 5f520fccf9
2 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
gen/functions.cpp
View file

@ -50,6 +50,9 @@ llvm::FunctionType* DtoFunctionType(Type* type, IrFuncTy &irFty, Type* thistype,
assert(type->ty == Tfunction); assert(type->ty == Tfunction);
TypeFunction* f = static_cast<TypeFunction*>(type); TypeFunction* f = static_cast<TypeFunction*>(type);
// Return cached type if available
if (irFty.funcType) return irFty.funcType;
TargetABI* abi = (f->linkage == LINKintrinsic ? TargetABI::getIntrinsic() : gABI); TargetABI* abi = (f->linkage == LINKintrinsic ? TargetABI::getIntrinsic() : gABI);
// Tell the ABI we're resolving a new function type // Tell the ABI we're resolving a new function type
abi->newFunctionType(f); abi->newFunctionType(f);
@ -283,11 +286,11 @@ llvm::FunctionType* DtoFunctionType(Type* type, IrFuncTy &irFty, Type* thistype,
std::reverse(argtypes.begin() + beg, argtypes.end()); std::reverse(argtypes.begin() + beg, argtypes.end());
} }
LLFunctionType* functype = LLFunctionType::get(irFty.ret->ltype, argtypes, irFty.c_vararg); irFty.funcType = LLFunctionType::get(irFty.ret->ltype, argtypes, irFty.c_vararg);
Logger::cout() << "Final function type: " << *functype << "\n"; Logger::cout() << "Final function type: " << *irFty.funcType << "\n";
return functype; return irFty.funcType;
} }
////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////

12
ir/irfuncty.h
View file

@ -33,6 +33,7 @@ namespace llvm {
class Value; class Value;
class Instruction; class Instruction;
class Function; class Function;
class FunctionType;
} }
// represents a function type argument // represents a function type argument
@ -87,6 +88,9 @@ struct IrFuncTyArg
// represents a function type // represents a function type
struct IrFuncTy struct IrFuncTy
{ {
// The final LLVM type
llvm::FunctionType* funcType;
// return value // return value
IrFuncTyArg* ret; IrFuncTyArg* ret;
@ -111,7 +115,8 @@ struct IrFuncTy
bool reverseParams; bool reverseParams;
IrFuncTy() IrFuncTy()
: ret(NULL), : funcType(0),
ret(NULL),
arg_sret(NULL), arg_sret(NULL),
arg_this(NULL), arg_this(NULL),
arg_nest(NULL), arg_nest(NULL),
@ -126,7 +131,8 @@ struct IrFuncTy
// Copy constructor and operator= seems to be required for MSC // Copy constructor and operator= seems to be required for MSC
IrFuncTy(const IrFuncTy& rhs) IrFuncTy(const IrFuncTy& rhs)
: ret(rhs.ret), : funcType(ths.funcType),
ret(rhs.ret),
args(IrFuncTy::ArgList(rhs.args)), args(IrFuncTy::ArgList(rhs.args)),
arg_sret(rhs.arg_sret), arg_sret(rhs.arg_sret),
arg_this(rhs.arg_this), arg_this(rhs.arg_this),
@ -139,6 +145,7 @@ struct IrFuncTy
IrFuncTy& operator=(const IrFuncTy& rhs) IrFuncTy& operator=(const IrFuncTy& rhs)
{ {
funcType = rhs.funcType;
ret = rhs.ret; ret = rhs.ret;
args = IrFuncTy::ArgList(rhs.args); args = IrFuncTy::ArgList(rhs.args);
arg_sret = rhs.arg_sret; arg_sret = rhs.arg_sret;
@ -153,6 +160,7 @@ struct IrFuncTy
#endif #endif
void reset() { void reset() {
funcType = 0;
ret = NULL; ret = NULL;
arg_sret = arg_this = arg_nest = arg_arguments = arg_argptr = NULL; arg_sret = arg_this = arg_nest = arg_arguments = arg_argptr = NULL;
#if defined(_MSC_VER) #if defined(_MSC_VER)