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 tangotests.asm2;

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

int main()
{
    int i = 40;
    int j = 2;
    version(D_InlineAsm_X86)
    {
	asm
    	{	
        	mov EAX, i;
        	mov EBX, j;
        	add EAX, EBX;
        	mov i, EAX;
    	}
    }
    else version(D_InlineAsm_X86_64)
    {
	asm
	{
		mov EAX, i;
		mov EBX, j;
		add EAX, EBX;
		mov i, EAX;
    	}
    }
    printf("42 = %d\n", i);
    assert(i == 42);
    return 0;
}