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

#ifndef LDC_GEN_LINKER_H
#define LDC_GEN_LINKER_H

#include "llvm/Support/CommandLine.h"
#include <vector>

extern llvm::cl::opt<bool> quiet;

namespace llvm
{
    class Module;
}

/**
 * Links the modules given in MV in to dst.
 * @param dst Destination module.
 * @param MV Vector of modules to link in to destination.
 */
void linkModules(llvm::Module* dst, const std::vector<llvm::Module*>& MV);

/**
 * Link an executable.
 * @param argv0 the argv[0] value as passed to main
 * @return 0 on success.
 */
int linkExecutable(const char* argv0);

/**
 * Link an executable only from object files.
 * @param argv0 the argv[0] value as passed to main
 * @return 0 on success.
 */
int linkObjToExecutable(const char* argv0);

/**
 * Delete the executable that was previously linked with linkExecutable.
 */
void deleteExecutable();

/**
 * Runs the executable that was previously linked with linkExecutable.
 * @return the return status of the executable.
 */
int runExecutable();

#endif // LDC_GEN_LINKER_H