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

module asm10;

struct S {
    ushort first;
    ushort second;
    int unaccessed;
}

void main() {
    auto s = S(512, 42, -1);
    ushort x = 0;
    version(D_InlineAsm_X86) {
        asm {
            lea EAX, s;
            mov CX, S.second[EAX];
            mov x, CX;
            mov S.first[EAX], 640;
        }
    } else version(D_InlineAsm_X86_64) {
        asm {
            lea RAX, s;
            mov CX, S.second[RAX];
            mov x, CX;
            mov S.first[RAX], 640;
        }
    }
    assert(x == 42);
    assert(s.first == 640);
    assert(s.second == 42);
    assert(s.unaccessed == -1);
}