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: }}}

int foo(int op)(int a, int b)
{
    version(X86)
    {
    const OP = (op == '+') ? "add" : "sub";
    asm { naked; }
    mixin("asm{"~OP~" EAX, [ESP+4];}");
    asm { ret 4; }
    }
    else version(X86_64)
    {
    const OP = (op == '+') ? "add" : "sub";
    asm { naked; }
    mixin("asm{"~OP~" ESI,EDI; mov EAX, ESI;}");
    asm { ret; }
    }
    else static assert(0, "todo");
}

void main()
{
        int i = foo!('+')(2, 4);
        assert(i == 6);
        i = foo!('-')(2, 4);
        assert(i == 2);
}