Merged with upstream/master

2013-11-22 08:13:16 +01:00
parent 6f200d310f 0f7ac1cc90
commit bb46b561fd
33 changed files with 795 additions and 394 deletions
--- a/ctx.cpp
+++ b/ctx.cpp
@@ -350,7 +350,7 @@ FunctionEmitContext::FunctionEmitContext(Function *func, Symbol *funSym,
            AssertPos(currentPos, diSubprogramType.Verify());
        }

-#if defined(LLVM_3_4)
+#if defined(LLVM_3_4) || defined(LLVM_3_5)
        Assert(diSubprogramType.isCompositeType());
        llvm::DICompositeType diSubprogramType_n =
            static_cast<llvm::DICompositeType>(diSubprogramType);