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.asm7;

// test massive label collisions (runtime uses Loverflow too)
extern(C) int printf(char*, ...);

void main()
{
    int a = add(1,2);
    int s = sub(1,2);
    assert(a == 3);
    assert(s == -1);
}

int add(int a, int b)
{
    int res;
    version (D_InlineAsm_X86)
    {
	asm
    	{
		mov EAX, a;
        	add EAX, b;
        	jo Loverflow;
        	mov res, EAX;
    	}
    }
    else version (D_InlineAsm_X86_64)
    {
	asm
	{
		mov EAX, a;
        	add EAX, b;
        	jo Loverflow;
        	mov res, EAX;
	}		
    }
    printf("%d\n",res);
    return res;
Loverflow:
    assert(0, "add overflow");
}

int sub(int a, int b)
{
    int res;
    version (D_InlineAsm_X86)
    {
    	asm
    	{
		mov EAX, a;
        	sub EAX, b;
        	jo Loverflow;
        	mov res, EAX;
    	}
    }
    else version (D_InlineAsm_X86_64)
    {
	asm
	{
		mov EAX, a;
        	sub EAX, b;
        	jo Loverflow;
        	mov res, EAX;
	}		
    }
    printf("%d\n",res);
    return res;
Loverflow:
    assert(0, "sub overflow");
    int x;
}