From 3ea0a76fb66bd94ea4b1381f58791513fadf6a04 Mon Sep 17 00:00:00 2001 From: LemonBoy Date: Sat, 12 Oct 2019 16:25:51 +0200 Subject: [PATCH] More clang API changes --- src/zig_clang.cpp | 5 +++-- src/zig_clang_cc1_main.cpp | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/zig_clang.cpp b/src/zig_clang.cpp index 99bd7bc721..c960376249 100644 --- a/src/zig_clang.cpp +++ b/src/zig_clang.cpp @@ -1831,14 +1831,15 @@ ZigClangASTUnit *ZigClangLoadFromCommandLine(const char **args_begin, const char bool allow_pch_with_compiler_errors = false; bool single_file_parse = false; bool for_serialization = false; + bool retain_excluded_conditional_blocks = false; std::unique_ptr *err_unit = new std::unique_ptr(); clang::ASTUnit *ast_unit = clang::ASTUnit::LoadFromCommandLine( args_begin, args_end, pch_container_ops, diags, resources_path, only_local_decls, clang::CaptureDiagsKind::All, clang::None, true, 0, clang::TU_Complete, false, false, allow_pch_with_compiler_errors, clang::SkipFunctionBodiesScope::None, - single_file_parse, user_files_are_volatile, for_serialization, clang::None, err_unit, - nullptr); + single_file_parse, user_files_are_volatile, for_serialization, retain_excluded_conditional_blocks, + clang::None, err_unit, nullptr); // Early failures in LoadFromCommandLine may return with ErrUnit unset. if (!ast_unit && !err_unit) { diff --git a/src/zig_clang_cc1_main.cpp b/src/zig_clang_cc1_main.cpp index 2255a9c377..d3515aa070 100644 --- a/src/zig_clang_cc1_main.cpp +++ b/src/zig_clang_cc1_main.cpp @@ -208,10 +208,10 @@ int cc1_main(ArrayRef Argv, const char *Argv0, void *MainAddr) { TextDiagnosticBuffer *DiagsBuffer = new TextDiagnosticBuffer; DiagnosticsEngine Diags(DiagID, &*DiagOpts, DiagsBuffer); bool Success = CompilerInvocation::CreateFromArgs( - Clang->getInvocation(), Argv.begin(), Argv.end(), Diags); + Clang->getInvocation(), Argv, Diags); if (Clang->getFrontendOpts().TimeTrace) - llvm::timeTraceProfilerInitialize(); + llvm::timeTraceProfilerInitialize(/* granularity (us) */ 500); // --print-supported-cpus takes priority over the actual compilation. if (Clang->getFrontendOpts().PrintSupportedCPUs)