view ir/irtypefunction.cpp @ 1605:1d5721f9ae18

[WIP] Merge DMD r251: bugzilla 111 (appending a dchar to a char[]) This patch needs some work in the code generation, because of the runtime changes (functions "_d_arrayappendcd" and "_d_arrayappendwd" are added). This doesn't affect existing code though, it just makes with patch a little useless, because something like this: char [] s; s ~= '\u6211'; That failed to compile with a nice error message previously to this change, now fails with and ugly error message (a failed assertion). Apparently there is a regression introduced by this patch too, when compiling Dil I get this assertion message: ldc: /home/luca/tesis/ldc/gen/statements.cpp:132: virtual void ReturnStatement::toIR(IRState*): Assertion `p->topfunc()->getReturnType() == llvm::Type::getVoidTy(gIR->context())' failed. 0 ldc 0x08a91628 Thank god we have bisecting capabilities in VCSs now ;) --- dmd/expression.c | 47 +++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 41 insertions(+), 6 deletions(-)
author Leandro Lucarella <llucax@gmail.com>
date Wed, 06 Jan 2010 15:18:19 -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();
}