Merge remote-tracking branch 'origin/master' into llvm8

2019-01-01 18:36:12 -05:00
parent c0e391e94a 6df8e4bca7
commit 036a49e97d
29 changed files with 667 additions and 940 deletions
--- a/src/zig_llvm.cpp
+++ b/src/zig_llvm.cpp
@@ -606,7 +606,7 @@ ZigLLVMDISubprogram *ZigLLVMCreateFunction(ZigLLVMDIBuilder *dibuilder, ZigLLVMD
            lineno,
            di_sub_type,
            scope_line,
-            DINode::FlagZero,
+            DINode::FlagStaticMember,
            DISubprogram::toSPFlags(is_local_to_unit, is_definition, is_optimized),
            nullptr,
            reinterpret_cast<DISubprogram *>(decl_subprogram),