Merge branch 'master' into nomosoa

2013-12-04 13:52:44 -05:00
parent ecb1174a18 d5b7c51e40
commit a448ccf20c
113 changed files with 12702 additions and 3251 deletions
--- a/type.cpp
+++ b/type.cpp
@@ -2897,7 +2897,7 @@ FunctionType::GetDIType(llvm::DIDescriptor scope) const {
    for (int i = 0; i < GetNumParameters(); ++i) {
        const Type *t = GetParameterType(i);
        if (t == NULL)
-#if defined(LLVM_3_4)
+#if defined(LLVM_3_4) || defined(LLVM_3_5)
            return llvm::DICompositeType();
 #else
            return llvm::DIType();