summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2018-05-30 22:02:11 -0600
committerTom Tromey <tom@tromey.com>2018-05-30 22:02:11 -0600
commit188ad1e2944d852fa0296381b96dd21cac5f8a4f (patch)
treefe2e3f401a65eb04c7d44dce014dec6cb4be0b5b
parentAuto merge of #51138 - spastorino:add-polonius-compare-mode, r=pnkfelix (diff)
downloadgrust-188ad1e2944d852fa0296381b96dd21cac5f8a4f.tar.gz
grust-188ad1e2944d852fa0296381b96dd21cac5f8a4f.tar.bz2
grust-188ad1e2944d852fa0296381b96dd21cac5f8a4f.tar.xz
random #include removalHEADmaster
-rw-r--r--src/rustllvm/RustWrapper.cpp15
-rw-r--r--src/rustllvm/rustllvm.h50
2 files changed, 1 insertions, 64 deletions
diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp
index df8602d080..14c8074aeb 100644
--- a/src/rustllvm/RustWrapper.cpp
+++ b/src/rustllvm/RustWrapper.cpp
@@ -9,21 +9,6 @@
9// except according to those terms. 9// except according to those terms.
10 10
11#include "rustllvm.h" 11#include "rustllvm.h"
12#include "llvm/IR/DebugInfoMetadata.h"
13#include "llvm/IR/DiagnosticInfo.h"
14#include "llvm/IR/DiagnosticPrinter.h"
15#include "llvm/IR/Instructions.h"
16#include "llvm/Object/Archive.h"
17#include "llvm/Object/ObjectFile.h"
18#include "llvm/Bitcode/BitcodeWriterPass.h"
19
20#include "llvm/IR/CallSite.h"
21
22#if LLVM_VERSION_GE(5, 0)
23#include "llvm/ADT/Optional.h"
24#else
25#include <cstdlib>
26#endif
27 12
28//===----------------------------------------------------------------------=== 13//===----------------------------------------------------------------------===
29// 14//
diff --git a/src/rustllvm/rustllvm.h b/src/rustllvm/rustllvm.h
index f4bd78147f..852ee30360 100644
--- a/src/rustllvm/rustllvm.h
+++ b/src/rustllvm/rustllvm.h
@@ -8,41 +8,7 @@
8// option. This file may not be copied, modified, or distributed 8// option. This file may not be copied, modified, or distributed
9// except according to those terms. 9// except according to those terms.
10 10
11#include "llvm-c/BitReader.h" 11#include <libgccjit.h>
12#include "llvm-c/Core.h"
13#include "llvm-c/ExecutionEngine.h"
14#include "llvm-c/Object.h"
15#include "llvm/ADT/ArrayRef.h"
16#include "llvm/ADT/DenseSet.h"
17#include "llvm/ADT/Triple.h"
18#include "llvm/Analysis/Lint.h"
19#include "llvm/Analysis/Passes.h"
20#include "llvm/ExecutionEngine/ExecutionEngine.h"
21#include "llvm/ExecutionEngine/Interpreter.h"
22#include "llvm/ExecutionEngine/MCJIT.h"
23#include "llvm/IR/IRBuilder.h"
24#include "llvm/IR/InlineAsm.h"
25#include "llvm/IR/InlineAsm.h"
26#include "llvm/IR/LLVMContext.h"
27#include "llvm/IR/LLVMContext.h"
28#include "llvm/IR/Module.h"
29#include "llvm/Support/CommandLine.h"
30#include "llvm/Support/Debug.h"
31#include "llvm/Support/DynamicLibrary.h"
32#include "llvm/Support/FormattedStream.h"
33#include "llvm/Support/Host.h"
34#include "llvm/Support/Memory.h"
35#include "llvm/Support/SourceMgr.h"
36#include "llvm/Support/TargetRegistry.h"
37#include "llvm/Support/TargetSelect.h"
38#include "llvm/Support/Timer.h"
39#include "llvm/Support/raw_ostream.h"
40#include "llvm/Target/TargetMachine.h"
41#include "llvm/Target/TargetOptions.h"
42#include "llvm/Transforms/IPO.h"
43#include "llvm/Transforms/Instrumentation.h"
44#include "llvm/Transforms/Scalar.h"
45#include "llvm/Transforms/Vectorize.h"
46 12
47#define LLVM_VERSION_GE(major, minor) \ 13#define LLVM_VERSION_GE(major, minor) \
48 (LLVM_VERSION_MAJOR > (major) || \ 14 (LLVM_VERSION_MAJOR > (major) || \
@@ -57,20 +23,6 @@
57 23
58#define LLVM_VERSION_LT(major, minor) (!LLVM_VERSION_GE((major), (minor))) 24#define LLVM_VERSION_LT(major, minor) (!LLVM_VERSION_GE((major), (minor)))
59 25
60#include "llvm/IR/LegacyPassManager.h"
61
62#if LLVM_VERSION_GE(4, 0)
63#include "llvm/Bitcode/BitcodeReader.h"
64#include "llvm/Bitcode/BitcodeWriter.h"
65#else
66#include "llvm/Bitcode/ReaderWriter.h"
67#endif
68
69#include "llvm/IR/DIBuilder.h"
70#include "llvm/IR/DebugInfo.h"
71#include "llvm/IR/IRPrintingPasses.h"
72#include "llvm/Linker/Linker.h"
73
74extern "C" void LLVMRustSetLastError(const char *); 26extern "C" void LLVMRustSetLastError(const char *);
75 27
76enum class LLVMRustResult { Success, Failure }; 28enum class LLVMRustResult { Success, Failure };