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

extern(C) int printf(char*, ...);

ulong retval() {
    version (X86)
    asm { naked; mov EAX, 0xff; mov EDX, 0xaa; ret; }
    else version (X86_64)
    asm { naked; mov RAX, 0xaa000000ff; ret; }
}

ulong retval2() {
    return (cast(ulong)0xaa << 32) | 0xff;
}

void main() {
    auto a = retval();
    auto b = retval2();
    printf("%llu\n%llu\n", retval(), retval2());
    assert(a == 0xaa000000ff);
    assert(a == b);
}