Merge branch 'master' into merge-2.064

This commit is contained in:
Kai Nacke
2014-01-03 13:54:10 +01:00
3 changed files with 10 additions and 6 deletions

View File

@@ -258,15 +258,15 @@ llvm::FunctionType* DtoFunctionType(Type* type, IrFuncTy &irFty, Type* thistype,
lidx++;
}
// Now we can modify irFty safely.
irFty = newIrFty;
// let the abi rewrite the types as necesary
abi->rewriteFunctionType(f, irFty);
abi->rewriteFunctionType(f, newIrFty);
// Tell the ABI we're done with this function type
abi->doneWithFunctionType();
// Now we can modify irFty safely.
irFty = llvm_move(newIrFty);
// build the function type
std::vector<LLType*> argtypes;
argtypes.reserve(lidx);