Mercurial > projects > ldc
view ir/irtypefunction.cpp @ 1621:fb2e6707ad17
Merge DMD r314+r315: bugzilla 2029 Typesafe variadic functions don't...
Both DMD revisions are for fixing bugzilla 2029 (Typesafe variadic
functions don't work in CTFE).
The DMD r314 commit message is:
bugzilla 2029 (Typesafe variadic functions don't work in CTFE
The DMD r315 commit message is:
bugzilla 2029 - try again
---
dmd/constfold.c | 11 ++++-
dmd/declaration.c | 21 +++++++++-
dmd/declaration.h | 10 ++++-
dmd/expression.c | 1 +
dmd/interpret.c | 111 +++++++++++++++++++++++++++++++++++++++++++++--------
dmd/mars.h | 2 +-
dmd/mtype.c | 2 +-
7 files changed, 135 insertions(+), 23 deletions(-)
author | Leandro Lucarella <llucax@gmail.com> |
---|---|
date | Wed, 06 Jan 2010 15:18:22 -0300 |
parents | 8d086d552909 |
children |
line wrap: on
line source
#include "llvm/DerivedTypes.h" #include "mtype.h" #include "gen/irstate.h" #include "gen/tollvm.h" #include "gen/functions.h" #include "ir/irtypefunction.h" IrTypeFunction::IrTypeFunction(Type * dt) : IrType(dt, llvm::OpaqueType::get(gIR->context())) { irfty = NULL; } const llvm::Type * IrTypeFunction::buildType() { const llvm::Type* T; TypeFunction* tf = (TypeFunction*)dtype; if (tf->funcdecl) T = DtoFunctionType(tf->funcdecl); else T = DtoFunctionType(tf,NULL,NULL); llvm::cast<llvm::OpaqueType>(pa.get())->refineAbstractTypeTo(T); return pa.get(); } ////////////////////////////////////////////////////////////////////////////// IrTypeDelegate::IrTypeDelegate(Type * dt) : IrType(dt, llvm::OpaqueType::get(gIR->context())) { } const llvm::Type * IrTypeDelegate::buildType() { assert(dtype->ty == Tdelegate); const LLType* i8ptr = getVoidPtrType(); const LLType* func = DtoFunctionType(dtype->nextOf(), NULL, Type::tvoid->pointerTo()); const LLType* funcptr = getPtrToType(func); const LLStructType* dgtype = LLStructType::get(gIR->context(), i8ptr, funcptr, NULL); gIR->module->addTypeName(dtype->toChars(), dgtype); llvm::cast<llvm::OpaqueType>(pa.get())->refineAbstractTypeTo(dgtype); return pa.get(); }