zig

commit 8efb3f5e197edf2debebf0557c74fef2541cc117 (tree)
parent 1f96a866769423e363f1c48654c0f51ecf75db58
Author: Andrew Kelley <superjoe30@gmail.com>
Date:   Sat, 26 May 2018 12:18:13 -0400

update to latest LLVM API

Diffstat:
M
src/translate_c.cpp
 | 
3
+--
M
src/zig_llvm.cpp
 | 
2
+-

2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/translate_c.cpp b/src/translate_c.cpp
@@ -4658,7 +4658,6 @@ int parse_h_file(ImportTableEntry *import, ZigList<ErrorMsg *> *errors, const ch
 
     std::shared_ptr<PCHContainerOperations> pch_container_ops = std::make_shared<PCHContainerOperations>();
 
-    bool skip_function_bodies = false;
     bool only_local_decls = true;
     bool capture_diagnostics = true;
     bool user_files_are_volatile = true;
@@ -4671,7 +4670,7 @@ int parse_h_file(ImportTableEntry *import, ZigList<ErrorMsg *> *errors, const ch
             &clang_argv.at(0), &clang_argv.last(),
             pch_container_ops, diags, resources_path,
             only_local_decls, capture_diagnostics, None, true, 0, TU_Complete,
-            false, false, allow_pch_with_compiler_errors, skip_function_bodies,
+            false, false, allow_pch_with_compiler_errors, SkipFunctionBodiesScope::None,
             single_file_parse, user_files_are_volatile, for_serialization, None, &err_unit,
             nullptr));
 
diff --git a/src/zig_llvm.cpp b/src/zig_llvm.cpp
@@ -162,7 +162,7 @@ bool ZigLLVMTargetMachineEmitToFile(LLVMTargetMachineRef targ_machine_ref, LLVMM
                 abort();
         }
 
-        if (target_machine->addPassesToEmitFile(MPM, dest, ft)) {
+        if (target_machine->addPassesToEmitFile(MPM, dest, nullptr, ft)) {
             *error_message = strdup("TargetMachine can't emit a file of this type");
             return true;
         }