Mercurial > projects > ldc
view ir/irstruct.h @ 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 | dd135ff697fa |
children |
line wrap: on
line source
#ifndef LDC_IR_IRSTRUCT_H #define LDC_IR_IRSTRUCT_H #include "ir/ir.h" #include <vector> #include <map> // DMD forward declarations struct StructInitializer; ////////////////////////////////////////////////////////////////////////////// // represents a struct or class // it is used during codegen to hold all the vital info we need struct IrStruct : IrBase { /// Constructor. IrStruct(AggregateDeclaration* agg); ////////////////////////////////////////////////////////////////////////// // public fields, // FIXME this is basically stuff I just haven't gotten around to yet. /// The D aggregate. AggregateDeclaration* aggrdecl; /// Aggregate D type. Type* type; /// true only for: align(1) struct S { ... } bool packed; /// Composite type debug description. llvm::DICompositeType diCompositeType; ////////////////////////////////////////////////////////////////////////// /// Create the __initZ symbol lazily. LLGlobalVariable* getInitSymbol(); /// Builds the __initZ initializer constant lazily. LLConstant* getDefaultInit(); /// Create the __vtblZ symbol lazily. LLGlobalVariable* getVtblSymbol(); /// Builds the __vtblZ initializer constant lazily. LLConstant* getVtblInit(); /// Create the __ClassZ symbol lazily. LLGlobalVariable* getClassInfoSymbol(); /// Builds the __ClassZ initializer constant lazily. LLConstant* getClassInfoInit(); /// Create the __interfaceInfos symbol lazily. LLGlobalVariable* getInterfaceArraySymbol(); /// Creates a StructInitializer constant. LLConstant* createStructInitializer(StructInitializer* si); ////////////////////////////////////////////////////////////////////////// /// Initialize interface. void initializeInterface(); ////////////////////////////////////////////////////////////////////////// protected: /// Static default initializer global. llvm::GlobalVariable* init; /// Static default initializer constant. LLConstant* constInit; /// Static default initialier type holder. llvm::PATypeHolder init_pa; /// Vtbl global. llvm::GlobalVariable* vtbl; /// Vtbl initializer constant. LLConstant* constVtbl; /// ClassInfo global. llvm::GlobalVariable* classInfo; /// ClassInfo initializer constant. LLConstant* constClassInfo; /// Map for mapping ClassDeclaration* to LLVM GlobalVariable. typedef std::map<ClassDeclaration*, llvm::GlobalVariable*> ClassGlobalMap; /// Map from of interface vtbls implemented by this class. ClassGlobalMap interfaceVtblMap; /// Interface info array global. /// Basically: static object.Interface[num_interfaces] llvm::GlobalVariable* classInterfacesArray; /// std::vector of BaseClass* typedef std::vector<BaseClass*> BaseClassVector; /// Array of all interface vtbl implementations - in order - implemented /// by this class. /// Corresponds to the Interface instances needed to be output. BaseClassVector interfacesWithVtbls; ////////////////////////////////////////////////////////////////////////// /// Create static default initializer for struct. LLConstant* createStructDefaultInitializer(); /// Create static default initializer for class. LLConstant* createClassDefaultInitializer(); /// Returns vtbl for interface implementation, creates it if not already built. llvm::GlobalVariable* getInterfaceVtbl( BaseClass* b, bool new_inst, size_t interfaces_index); /// Add base class data to initializer list. /// Also creates the IrField instance for each data field. void addBaseClassInits( std::vector<llvm::Constant*>& constants, ClassDeclaration* base, size_t& offset, size_t& field_index); // FIXME make this a member instead friend LLConstant* DtoDefineClassInfo(ClassDeclaration* cd); /// Create the Interface[] interfaces ClassInfo field initializer. LLConstant* getClassInfoInterfaces(); }; ////////////////////////////////////////////////////////////////////////////// #endif