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 asm9;

version(X86)            version = DoSome;
else version(X86_64)    version = DoSome;

T add(T, T t)(T a) {
    asm {
        add a, t;
    }
    return a;
}

void main() {
    version (DoSome) {
        assert(add!(ubyte, 20)(10) == 30);
        assert(add!(ushort, 20_000)(10_000) == 30_000);
        assert(add!(uint, 2_000_000)(1_000_000) == 3_000_000);
    }
    version(X86_64) {
        // 64-bit immediates aren't allowed on "ADD", nor are
        // unsigned 32-bit ones, so make the template parameter
        // fit in a 32-bit signed int.
        // These values were chosen so that the lower 32-bits overflow
        // and we can see the upper half of the 64-bit input increment.
        auto result = add!(long, 2_000_000_000)(21_000_000_000);
        assert(result == 23_000_000_000);
    }
}