Mercurial > projects > ldc
view ir/irdsymbol.cpp @ 1442:0a5f7890f327
Adjust some more code that was depending on the function and delegate calling
conventions being equal.
There's also an instance in `tango.text.convert.Layout` that should be adjusted:
{{{
Index: tango/text/convert/Layout.d
===================================================================
--- tango/text/convert/Layout.d (revision 4578)
+++ tango/text/convert/Layout.d (working copy)
-660,8 +660,12 @@
case TypeCode.STRUCT:
auto s = cast(TypeInfo_Struct) type;
- if (s.xtoString)
- return Utf.fromString8 (s.xtoString(p), result);
+ if (s.xtoString) {
+ char[] delegate() toString;
+ toString.ptr = p;
+ toString.funcptr = cast(char[] function()) s.xtoString;
+ return Utf.fromString8 (toString(), result);
+ }
goto default;
case TypeCode.INTERFACE:
}}}
author | Frits van Bommel <fvbommel wxs.nl> |
---|---|
date | Sun, 31 May 2009 15:27:01 +0200 |
parents | 229e02867307 |
children |
line wrap: on
line source
#include "gen/llvm.h" #include "ir/ir.h" #include "ir/irdsymbol.h" #include "ir/irvar.h" #include "gen/logger.h" std::set<IrDsymbol*> IrDsymbol::list; void IrDsymbol::resetAll() { Logger::println("resetting %zu Dsymbols", list.size()); std::set<IrDsymbol*>::iterator it; for(it = list.begin(); it != list.end(); ++it) (*it)->reset(); } IrDsymbol::IrDsymbol() { bool incr = list.insert(this).second; assert(incr); reset(); } IrDsymbol::IrDsymbol(const IrDsymbol& s) { bool incr = list.insert(this).second; assert(incr); DModule = s.DModule; irModule = s.irModule; irStruct = s.irStruct; irFunc = s.irFunc; resolved = s.resolved; declared = s.declared; initialized = s.initialized; defined = s.defined; irGlobal = s.irGlobal; irLocal = s.irLocal; irField = s.irField; } IrDsymbol::~IrDsymbol() { list.erase(this); } void IrDsymbol::reset() { DModule = NULL; irModule = NULL; irStruct = NULL; irFunc = NULL; resolved = declared = initialized = defined = false; irGlobal = NULL; irLocal = NULL; irField = NULL; } bool IrDsymbol::isSet() { return (irStruct || irFunc || irGlobal || irLocal || irField); } IrVar* IrDsymbol::getIrVar() { assert(irGlobal || irLocal || irField); return irGlobal ? (IrVar*)irGlobal : irLocal ? (IrVar*)irLocal : (IrVar*)irField; } llvm::Value*& IrDsymbol::getIrValue() { return getIrVar()->value; }