diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2019-03-20 13:34:07 -0400 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2019-03-20 13:34:07 -0400 |
| commit | 3c7555cb679492f3f1c0ce320cbdf4a3769e56db (patch) | |
| tree | 6a59ff4cd7d7e27e8d066fb3d3e07be6dffa012b /src/zig_clang_cc1_main.cpp | |
| parent | 2fdf69bc4082c49a571c0ee7bb7441d910def795 (diff) | |
| parent | 1b25dcde9691835d0c3f5449f4c9565b9074de0e (diff) | |
| download | zig-3c7555cb679492f3f1c0ce320cbdf4a3769e56db.tar.gz zig-3c7555cb679492f3f1c0ce320cbdf4a3769e56db.zip | |
Merge remote-tracking branch 'origin/llvm8'
Diffstat (limited to 'src/zig_clang_cc1_main.cpp')
| -rw-r--r-- | src/zig_clang_cc1_main.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/zig_clang_cc1_main.cpp b/src/zig_clang_cc1_main.cpp index ee0f212ff3..3d9688b059 100644 --- a/src/zig_clang_cc1_main.cpp +++ b/src/zig_clang_cc1_main.cpp @@ -13,10 +13,9 @@ // //===----------------------------------------------------------------------===// -#include "llvm/Option/Arg.h" +#include "clang/Basic/Stack.h" #include "clang/CodeGen/ObjectFilePCHContainerOperations.h" #include "clang/Config/config.h" -#include "clang/Basic/Stack.h" #include "clang/Driver/DriverDiagnostic.h" #include "clang/Driver/Options.h" #include "clang/Frontend/CompilerInstance.h" @@ -29,8 +28,10 @@ #include "llvm/ADT/Statistic.h" #include "llvm/Config/llvm-config.h" #include "llvm/LinkAllPasses.h" +#include "llvm/Option/Arg.h" #include "llvm/Option/ArgList.h" #include "llvm/Option/OptTable.h" +#include "llvm/Support/BuryPointer.h" #include "llvm/Support/Compiler.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/ManagedStatic.h" @@ -217,7 +218,7 @@ int cc1_main(ArrayRef<const char *> Argv, const char *Argv0, void *MainAddr) { // When running with -disable-free, don't do any destruction or shutdown. if (Clang->getFrontendOpts().DisableFree) { - BuryPointer(std::move(Clang)); + llvm::BuryPointer(std::move(Clang)); return !Success; } |