D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-01-16 21:03:14 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into merge-2.061-2

Browse Source
This commit is contained in:
David Nadlinger
2013-01-12 01:27:02 +01:00
parent b99b78558b 81aee147cf
commit 30caa4bfe6
30 changed files with 134 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gen/functions.cpp
View File

@@ -9,7 +9,11 @@
#include "gen/llvm.h"
#include "llvm/Support/CFG.h"
#if LDC_LLVM_VER >= 303
#include "llvm/IR/Intrinsics.h"
#else
#include "llvm/Intrinsics.h"
#endif
#include "mtype.h"
#include "aggregate.h"
@@ -345,7 +349,11 @@ LLFunction* DtoInlineIRFunction(FuncDeclaration* fdecl)
if(errstr != "")
error(tinst->loc,
"can't parse inline LLVM IR:\n%s\n%s\n%s\nThe input string was: \n%s",
#if LDC_LLVM_VER >= 303
err.getLineContents().str().c_str(),
#else
err.getLineContents().c_str(),
#endif
(std::string(err.getColumnNo(), ' ') + '^').c_str(),
errstr.c_str(), stream.str().c_str());