diff options
Diffstat (limited to 'lib')
219 files changed, 440 insertions, 434 deletions
diff --git a/lib/Analysis/AliasAnalysisEvaluator.cpp b/lib/Analysis/AliasAnalysisEvaluator.cpp index b4a183d1c4..af0a25a409 100644 --- a/lib/Analysis/AliasAnalysisEvaluator.cpp +++ b/lib/Analysis/AliasAnalysisEvaluator.cpp @@ -24,7 +24,7 @@ #include "llvm/Analysis/AliasAnalysis.h" #include "llvm/Assembly/Writer.h" #include "llvm/Support/InstIterator.h" -#include "Support/CommandLine.h" +#include "llvm/Support/CommandLine.h" #include <iostream> #include <set> diff --git a/lib/Analysis/CFGPrinter.cpp b/lib/Analysis/CFGPrinter.cpp index 9eaaec690b..88f9843c0b 100644 --- a/lib/Analysis/CFGPrinter.cpp +++ b/lib/Analysis/CFGPrinter.cpp @@ -23,7 +23,7 @@ #include "llvm/Analysis/CFGPrinter.h" #include "llvm/Assembly/Writer.h" #include "llvm/Support/CFG.h" -#include "Support/GraphWriter.h" +#include "llvm/Support/GraphWriter.h" #include <sstream> #include <fstream> using namespace llvm; diff --git a/lib/Analysis/DataStructure/BottomUpClosure.cpp b/lib/Analysis/DataStructure/BottomUpClosure.cpp index 9f2124a1bb..4bc6fafcf6 100644 --- a/lib/Analysis/DataStructure/BottomUpClosure.cpp +++ b/lib/Analysis/DataStructure/BottomUpClosure.cpp @@ -16,8 +16,8 @@ #include "llvm/Analysis/DataStructure/DataStructure.h" #include "llvm/Module.h" -#include "Support/Statistic.h" -#include "Support/Debug.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/Support/Debug.h" #include "DSCallSiteIterator.h" using namespace llvm; diff --git a/lib/Analysis/DataStructure/CompleteBottomUp.cpp b/lib/Analysis/DataStructure/CompleteBottomUp.cpp index 589891f557..b2a0f4ba9b 100644 --- a/lib/Analysis/DataStructure/CompleteBottomUp.cpp +++ b/lib/Analysis/DataStructure/CompleteBottomUp.cpp @@ -16,10 +16,10 @@ #include "llvm/Analysis/DataStructure/DataStructure.h" #include "llvm/Module.h" #include "llvm/Analysis/DataStructure/DSGraph.h" -#include "Support/Debug.h" -#include "Support/SCCIterator.h" -#include "Support/Statistic.h" -#include "Support/STLExtras.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/SCCIterator.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/STLExtras.h" using namespace llvm; namespace { diff --git a/lib/Analysis/DataStructure/DataStructure.cpp b/lib/Analysis/DataStructure/DataStructure.cpp index 83aa890d96..de34265f2a 100644 --- a/lib/Analysis/DataStructure/DataStructure.cpp +++ b/lib/Analysis/DataStructure/DataStructure.cpp @@ -18,12 +18,12 @@ #include "llvm/DerivedTypes.h" #include "llvm/Target/TargetData.h" #include "llvm/Assembly/Writer.h" -#include "Support/CommandLine.h" -#include "Support/Debug.h" -#include "Support/DepthFirstIterator.h" -#include "Support/STLExtras.h" -#include "Support/Statistic.h" -#include "Support/Timer.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/DepthFirstIterator.h" +#include "llvm/ADT/STLExtras.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/Support/Timer.h" #include <algorithm> using namespace llvm; diff --git a/lib/Analysis/DataStructure/DataStructureOpt.cpp b/lib/Analysis/DataStructure/DataStructureOpt.cpp index 6c2e5df3a7..f7a1ed9af3 100644 --- a/lib/Analysis/DataStructure/DataStructureOpt.cpp +++ b/lib/Analysis/DataStructure/DataStructureOpt.cpp @@ -16,7 +16,7 @@ #include "llvm/Analysis/DataStructure/DSGraph.h" #include "llvm/Module.h" #include "llvm/Constant.h" -#include "Support/Statistic.h" +#include "llvm/ADT/Statistic.h" using namespace llvm; namespace { diff --git a/lib/Analysis/DataStructure/DataStructureStats.cpp b/lib/Analysis/DataStructure/DataStructureStats.cpp index 1bfe09aba5..7e3f85f3a6 100644 --- a/lib/Analysis/DataStructure/DataStructureStats.cpp +++ b/lib/Analysis/DataStructure/DataStructureStats.cpp @@ -17,7 +17,7 @@ #include "llvm/Instructions.h" #include "llvm/Pass.h" #include "llvm/Support/InstVisitor.h" -#include "Support/Statistic.h" +#include "llvm/ADT/Statistic.h" #include <vector> using namespace llvm; diff --git a/lib/Analysis/DataStructure/DependenceGraph.h b/lib/Analysis/DataStructure/DependenceGraph.h index 679ecd7d13..520b008528 100644 --- a/lib/Analysis/DataStructure/DependenceGraph.h +++ b/lib/Analysis/DataStructure/DependenceGraph.h @@ -24,7 +24,7 @@ #ifndef LLVM_ANALYSIS_DEPENDENCEGRAPH_H #define LLVM_ANALYSIS_DEPENDENCEGRAPH_H -#include "Support/hash_map" +#include "llvm/ADT/hash_map" #include <cassert> #include <iosfwd> #include <utility> diff --git a/lib/Analysis/DataStructure/GraphChecker.cpp b/lib/Analysis/DataStructure/GraphChecker.cpp index 5cb37bb23e..8cef6b37bf 100644 --- a/lib/Analysis/DataStructure/GraphChecker.cpp +++ b/lib/Analysis/DataStructure/GraphChecker.cpp @@ -25,7 +25,7 @@ #include "llvm/Analysis/DataStructure/DataStructure.h" #include "llvm/Analysis/DataStructure/DSGraph.h" -#include "Support/CommandLine.h" +#include "llvm/Support/CommandLine.h" #include "llvm/Value.h" #include <iostream> #include <set> diff --git a/lib/Analysis/DataStructure/IPModRef.cpp b/lib/Analysis/DataStructure/IPModRef.cpp index bf1940ebe6..ccc15f74e4 100644 --- a/lib/Analysis/DataStructure/IPModRef.cpp +++ b/lib/Analysis/DataStructure/IPModRef.cpp @@ -16,9 +16,9 @@ #include "llvm/Analysis/DataStructure/DSGraph.h" #include "llvm/Module.h" #include "llvm/Instructions.h" -#include "Support/Statistic.h" -#include "Support/STLExtras.h" -#include "Support/StringExtras.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/STLExtras.h" +#include "llvm/ADT/StringExtras.h" #include <vector> namespace llvm { diff --git a/lib/Analysis/DataStructure/IPModRef.h b/lib/Analysis/DataStructure/IPModRef.h index 57649da723..4a825dbea3 100644 --- a/lib/Analysis/DataStructure/IPModRef.h +++ b/lib/Analysis/DataStructure/IPModRef.h @@ -47,8 +47,8 @@ #define LLVM_ANALYSIS_IPMODREF_H #include "llvm/Pass.h" -#include "Support/BitSetVector.h" -#include "Support/hash_map" +#include "llvm/ADT/BitSetVector.h" +#include "llvm/ADT/hash_map" namespace llvm { diff --git a/lib/Analysis/DataStructure/Local.cpp b/lib/Analysis/DataStructure/Local.cpp index 34c56dc2ea..b21f2f1024 100644 --- a/lib/Analysis/DataStructure/Local.cpp +++ b/lib/Analysis/DataStructure/Local.cpp @@ -21,9 +21,9 @@ #include "llvm/Support/GetElementPtrTypeIterator.h" #include "llvm/Support/InstVisitor.h" #include "llvm/Target/TargetData.h" -#include "Support/CommandLine.h" -#include "Support/Debug.h" -#include "Support/Timer.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/Debug.h" +#include "llvm/Support/Timer.h" // FIXME: This should eventually be a FunctionPass that is automatically // aggregated into a Pass. diff --git a/lib/Analysis/DataStructure/MemoryDepAnalysis.cpp b/lib/Analysis/DataStructure/MemoryDepAnalysis.cpp index 7c39365d06..49b6425930 100644 --- a/lib/Analysis/DataStructure/MemoryDepAnalysis.cpp +++ b/lib/Analysis/DataStructure/MemoryDepAnalysis.cpp @@ -25,11 +25,11 @@ #include "llvm/Analysis/DataStructure/DSGraph.h" #include "llvm/Support/InstVisitor.h" #include "llvm/Support/CFG.h" -#include "Support/SCCIterator.h" -#include "Support/Statistic.h" -#include "Support/STLExtras.h" -#include "Support/hash_map" -#include "Support/hash_set" +#include "llvm/ADT/SCCIterator.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/STLExtras.h" +#include "llvm/ADT/hash_map" +#include "llvm/ADT/hash_set" namespace llvm { diff --git a/lib/Analysis/DataStructure/MemoryDepAnalysis.h b/lib/Analysis/DataStructure/MemoryDepAnalysis.h index 04d78dafff..570a03b679 100644 --- a/lib/Analysis/DataStructure/MemoryDepAnalysis.h +++ b/lib/Analysis/DataStructure/MemoryDepAnalysis.h @@ -22,7 +22,7 @@ #include "DependenceGraph.h" #include "llvm/Pass.h" -#include "Support/hash_map" +#include "llvm/ADT/hash_map" namespace llvm { diff --git a/lib/Analysis/DataStructure/Parallelize.cpp b/lib/Analysis/DataStructure/Parallelize.cpp index c944b8cc20..3dcb05ee06 100644 --- a/lib/Analysis/DataStructure/Parallelize.cpp +++ b/lib/Analysis/DataStructure/Parallelize.cpp @@ -46,10 +46,10 @@ #include "llvm/Analysis/DataStructure/DSGraph.h" #include "llvm/Support/InstVisitor.h" #include "llvm/Transforms/Utils/Local.h" -#include "Support/Statistic.h" -#include "Support/STLExtras.h" -#include "Support/hash_set" -#include "Support/hash_map" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/STLExtras.h" +#include "llvm/ADT/hash_set" +#include "llvm/ADT/hash_map" #include <functional> #include <algorithm> using namespace llvm; diff --git a/lib/Analysis/DataStructure/PgmDependenceGraph.h b/lib/Analysis/DataStructure/PgmDependenceGraph.h index 5f7f7d581b..ec6f927a7e 100644 --- a/lib/Analysis/DataStructure/PgmDependenceGraph.h +++ b/lib/Analysis/DataStructure/PgmDependenceGraph.h @@ -43,7 +43,7 @@ /* #include "llvm/Analysis/PostDominators.h" -- see below */ #include "llvm/Instruction.h" #include "llvm/Pass.h" -#include "Support/iterator" +#include "llvm/ADT/iterator" namespace llvm { diff --git a/lib/Analysis/DataStructure/Printer.cpp b/lib/Analysis/DataStructure/Printer.cpp index 24bf768379..c951433f49 100644 --- a/lib/Analysis/DataStructure/Printer.cpp +++ b/lib/Analysis/DataStructure/Printer.cpp @@ -17,9 +17,9 @@ #include "llvm/Module.h" #include "llvm/Constants.h" #include "llvm/Assembly/Writer.h" -#include "Support/CommandLine.h" -#include "Support/GraphWriter.h" -#include "Support/Statistic.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/GraphWriter.h" +#include "llvm/ADT/Statistic.h" #include <fstream> #include <sstream> using namespace llvm; diff --git a/lib/Analysis/DataStructure/Steensgaard.cpp b/lib/Analysis/DataStructure/Steensgaard.cpp index 55a6deb048..deeb8b3450 100644 --- a/lib/Analysis/DataStructure/Steensgaard.cpp +++ b/lib/Analysis/DataStructure/Steensgaard.cpp @@ -18,7 +18,7 @@ #include "llvm/Analysis/DataStructure/DSGraph.h" #include "llvm/Analysis/AliasAnalysis.h" #include "llvm/Module.h" -#include "Support/Debug.h" +#include "llvm/Support/Debug.h" using namespace llvm; namespace { diff --git a/lib/Analysis/DataStructure/TopDownClosure.cpp b/lib/Analysis/DataStructure/TopDownClosure.cpp index 4635787a04..1d861e8216 100644 --- a/lib/Analysis/DataStructure/TopDownClosure.cpp +++ b/lib/Analysis/DataStructure/TopDownClosure.cpp @@ -18,8 +18,8 @@ #include "llvm/Module.h" #include "llvm/DerivedTypes.h" #include "llvm/Analysis/DataStructure/DSGraph.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" using namespace llvm; namespace { diff --git a/lib/Analysis/IPA/Andersens.cpp b/lib/Analysis/IPA/Andersens.cpp index 54dfd7458d..7901c91abb 100644 --- a/lib/Analysis/IPA/Andersens.cpp +++ b/lib/Analysis/IPA/Andersens.cpp @@ -58,8 +58,8 @@ #include "llvm/Support/InstIterator.h" #include "llvm/Support/InstVisitor.h" #include "llvm/Analysis/AliasAnalysis.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" #include <set> using namespace llvm; diff --git a/lib/Analysis/IPA/CallGraph.cpp b/lib/Analysis/IPA/CallGraph.cpp index 8025ab2d9a..75e068ba54 100644 --- a/lib/Analysis/IPA/CallGraph.cpp +++ b/lib/Analysis/IPA/CallGraph.cpp @@ -16,7 +16,7 @@ #include "llvm/Module.h" #include "llvm/Instructions.h" #include "llvm/Support/CallSite.h" -#include "Support/STLExtras.h" +#include "llvm/ADT/STLExtras.h" #include <iostream> using namespace llvm; diff --git a/lib/Analysis/IPA/CallGraphSCCPass.cpp b/lib/Analysis/IPA/CallGraphSCCPass.cpp index f4e2efbe1c..f7d7ab126a 100644 --- a/lib/Analysis/IPA/CallGraphSCCPass.cpp +++ b/lib/Analysis/IPA/CallGraphSCCPass.cpp @@ -17,7 +17,7 @@ #include "llvm/CallGraphSCCPass.h" #include "llvm/Analysis/CallGraph.h" -#include "Support/SCCIterator.h" +#include "llvm/ADT/SCCIterator.h" using namespace llvm; /// getAnalysisUsage - For this class, we declare that we require and preserve diff --git a/lib/Analysis/IPA/FindUnsafePointerTypes.cpp b/lib/Analysis/IPA/FindUnsafePointerTypes.cpp index 52a83a1dfd..23ee99aa59 100644 --- a/lib/Analysis/IPA/FindUnsafePointerTypes.cpp +++ b/lib/Analysis/IPA/FindUnsafePointerTypes.cpp @@ -28,7 +28,7 @@ #include "llvm/DerivedTypes.h" #include "llvm/Module.h" #include "llvm/Support/InstIterator.h" -#include "Support/CommandLine.h" +#include "llvm/Support/CommandLine.h" using namespace llvm; static RegisterAnalysis<FindUnsafePointerTypes> diff --git a/lib/Analysis/IPA/GlobalsModRef.cpp b/lib/Analysis/IPA/GlobalsModRef.cpp index 219fdbf649..c1f15ed238 100644 --- a/lib/Analysis/IPA/GlobalsModRef.cpp +++ b/lib/Analysis/IPA/GlobalsModRef.cpp @@ -22,9 +22,9 @@ #include "llvm/Analysis/AliasAnalysis.h" #include "llvm/Analysis/CallGraph.h" #include "llvm/Support/InstIterator.h" -#include "Support/CommandLine.h" -#include "Support/Statistic.h" -#include "Support/SCCIterator.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/SCCIterator.h" #include <set> using namespace llvm; diff --git a/lib/Analysis/IPA/PrintSCC.cpp b/lib/Analysis/IPA/PrintSCC.cpp index 8911cc36e2..e4af831752 100644 --- a/lib/Analysis/IPA/PrintSCC.cpp +++ b/lib/Analysis/IPA/PrintSCC.cpp @@ -29,7 +29,7 @@ #include "llvm/Module.h" #include "llvm/Analysis/CallGraph.h" #include "llvm/Support/CFG.h" -#include "Support/SCCIterator.h" +#include "llvm/ADT/SCCIterator.h" #include <iostream> namespace llvm { diff --git a/lib/Analysis/InstCount.cpp b/lib/Analysis/InstCount.cpp index 9177e44800..12d16b081e 100644 --- a/lib/Analysis/InstCount.cpp +++ b/lib/Analysis/InstCount.cpp @@ -14,7 +14,7 @@ #include "llvm/Pass.h" #include "llvm/Function.h" #include "llvm/Support/InstVisitor.h" -#include "Support/Statistic.h" +#include "llvm/ADT/Statistic.h" namespace llvm { diff --git a/lib/Analysis/IntervalPartition.cpp b/lib/Analysis/IntervalPartition.cpp index 12c196f2f7..9253f721ab 100644 --- a/lib/Analysis/IntervalPartition.cpp +++ b/lib/Analysis/IntervalPartition.cpp @@ -13,7 +13,7 @@ //===----------------------------------------------------------------------===// #include "llvm/Analysis/IntervalIterator.h" -#include "Support/STLExtras.h" +#include "llvm/ADT/STLExtras.h" namespace llvm { diff --git a/lib/Analysis/LoopInfo.cpp b/lib/Analysis/LoopInfo.cpp index 131d02a32b..710f74afe2 100644 --- a/lib/Analysis/LoopInfo.cpp +++ b/lib/Analysis/LoopInfo.cpp @@ -20,7 +20,7 @@ #include "llvm/Analysis/Dominators.h" #include "llvm/Assembly/Writer.h" #include "llvm/Support/CFG.h" -#include "Support/DepthFirstIterator.h" +#include "llvm/ADT/DepthFirstIterator.h" #include <algorithm> #include <iostream> diff --git a/lib/Analysis/PostDominators.cpp b/lib/Analysis/PostDominators.cpp index ff202f0151..e5908c496b 100644 --- a/lib/Analysis/PostDominators.cpp +++ b/lib/Analysis/PostDominators.cpp @@ -14,8 +14,8 @@ #include "llvm/Analysis/PostDominators.h" #include "llvm/Instructions.h" #include "llvm/Support/CFG.h" -#include "Support/DepthFirstIterator.h" -#include "Support/SetOperations.h" +#include "llvm/ADT/DepthFirstIterator.h" +#include "llvm/ADT/SetOperations.h" using namespace llvm; //===----------------------------------------------------------------------===// diff --git a/lib/Analysis/ProfileInfoLoaderPass.cpp b/lib/Analysis/ProfileInfoLoaderPass.cpp index 4ab56ce156..cd3f575355 100644 --- a/lib/Analysis/ProfileInfoLoaderPass.cpp +++ b/lib/Analysis/ProfileInfoLoaderPass.cpp @@ -17,7 +17,7 @@ #include "llvm/Pass.h" #include "llvm/Analysis/ProfileInfo.h" #include "llvm/Analysis/ProfileInfoLoader.h" -#include "Support/CommandLine.h" +#include "llvm/Support/CommandLine.h" #include <iostream> using namespace llvm; diff --git a/lib/Analysis/ScalarEvolution.cpp b/lib/Analysis/ScalarEvolution.cpp index cac3b507ba..efe4d92bff 100644 --- a/lib/Analysis/ScalarEvolution.cpp +++ b/lib/Analysis/ScalarEvolution.cpp @@ -72,8 +72,8 @@ #include "llvm/Support/CFG.h" #include "llvm/Support/ConstantRange.h" #include "llvm/Support/InstIterator.h" -#include "Support/CommandLine.h" -#include "Support/Statistic.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/ADT/Statistic.h" #include <cmath> using namespace llvm; diff --git a/lib/Archive/ArchiveReader.cpp b/lib/Archive/ArchiveReader.cpp index 1d8530fc78..50e11d6ab5 100644 --- a/lib/Archive/ArchiveReader.cpp +++ b/lib/Archive/ArchiveReader.cpp @@ -18,7 +18,7 @@ #include "llvm/Bytecode/Reader.h" #include "llvm/Module.h" -#include "Support/FileUtilities.h" +#include "llvm/Support/FileUtilities.h" #include <cstdlib> #include <iostream> using namespace llvm; diff --git a/lib/AsmParser/ParserInternals.h b/lib/AsmParser/ParserInternals.h index 71876a55b4..9fdc8e66f8 100644 --- a/lib/AsmParser/ParserInternals.h +++ b/lib/AsmParser/ParserInternals.h @@ -20,7 +20,7 @@ #include "llvm/Function.h" #include "llvm/Instructions.h" #include "llvm/Assembly/Parser.h" -#include "Support/StringExtras.h" +#include "llvm/ADT/StringExtras.h" // Global variables exported from the lexer... extern std::FILE *llvmAsmin; diff --git a/lib/AsmParser/llvmAsmParser.y b/lib/AsmParser/llvmAsmParser.y index 8ba89bc879..1fd8782dae 100644 --- a/lib/AsmParser/llvmAsmParser.y +++ b/lib/AsmParser/llvmAsmParser.y @@ -17,7 +17,7 @@ #include "llvm/Module.h" #include "llvm/SymbolTable.h" #include "llvm/Support/GetElementPtrTypeIterator.h" -#include "Support/STLExtras.h" +#include "llvm/ADT/STLExtras.h" #include <algorithm> #include <iostream> #include <list> diff --git a/lib/Bytecode/Archive/ArchiveReader.cpp b/lib/Bytecode/Archive/ArchiveReader.cpp index 1d8530fc78..50e11d6ab5 100644 --- a/lib/Bytecode/Archive/ArchiveReader.cpp +++ b/lib/Bytecode/Archive/ArchiveReader.cpp @@ -18,7 +18,7 @@ #include "llvm/Bytecode/Reader.h" #include "llvm/Module.h" -#include "Support/FileUtilities.h" +#include "llvm/Support/FileUtilities.h" #include <cstdlib> #include <iostream> using namespace llvm; diff --git a/lib/Bytecode/Reader/ArchiveReader.cpp b/lib/Bytecode/Reader/ArchiveReader.cpp index 1d8530fc78..50e11d6ab5 100644 --- a/lib/Bytecode/Reader/ArchiveReader.cpp +++ b/lib/Bytecode/Reader/ArchiveReader.cpp @@ -18,7 +18,7 @@ #include "llvm/Bytecode/Reader.h" #include "llvm/Module.h" -#include "Support/FileUtilities.h" +#include "llvm/Support/FileUtilities.h" #include <cstdlib> #include <iostream> using namespace llvm; diff --git a/lib/Bytecode/Reader/Reader.cpp b/lib/Bytecode/Reader/Reader.cpp index f0b39d45de..39f238c986 100644 --- a/lib/Bytecode/Reader/Reader.cpp +++ b/lib/Bytecode/Reader/Reader.cpp @@ -24,7 +24,7 @@ #include "llvm/SymbolTable.h" #include "llvm/Bytecode/Format.h" #include "llvm/Support/GetElementPtrTypeIterator.h" -#include "Support/StringExtras.h" +#include "llvm/ADT/StringExtras.h" #include <sstream> using namespace llvm; @@ -428,14 +428,20 @@ Value * BytecodeReader::getValue(unsigned type, unsigned oNum, bool Create) { if (!Create) return 0; // Do not create a placeholder? + // Did we already create a place holder? std::pair<unsigned,unsigned> KeyValue(type, oNum); ForwardReferenceMap::iterator I = ForwardReferences.lower_bound(KeyValue); if (I != ForwardReferences.end() && I->first == KeyValue) return I->second; // We have already created this placeholder - Value *Val = new Argument(getType(type)); - ForwardReferences.insert(I, std::make_pair(KeyValue, Val)); - return Val; + // If the type exists (it should) + if (const Type* Ty = getType(type)) { + // Create the place holder + Value *Val = new Argument(Ty); + ForwardReferences.insert(I, std::make_pair(KeyValue, Val)); + return Val; + } + throw "Can't create placeholder for value of type slot #" + utostr(type); } /// This is just like getValue, but when a compaction table is in use, it diff --git a/lib/Bytecode/Reader/ReaderWrappers.cpp b/lib/Bytecode/Reader/ReaderWrappers.cpp index 2930a42c63..383e53e9be 100644 --- a/lib/Bytecode/Reader/ReaderWrappers.cpp +++ b/lib/Bytecode/Reader/ReaderWrappers.cpp @@ -17,9 +17,9 @@ #include "Reader.h" #include "llvm/Module.h" #include "llvm/Instructions.h" -#include "Support/FileUtilities.h" -#include "Support/StringExtras.h" -#include "Config/unistd.h" +#include "llvm/Support/FileUtilities.h" +#include "llvm/ADT/StringExtras.h" +#include "llvm/Config/unistd.h" #include <cerrno> using namespace llvm; diff --git a/lib/Bytecode/Writer/SlotCalculator.cpp b/lib/Bytecode/Writer/SlotCalculator.cpp index 2656edd8a5..d4145dbcdc 100644 --- a/lib/Bytecode/Writer/SlotCalculator.cpp +++ b/lib/Bytecode/Writer/SlotCalculator.cpp @@ -23,8 +23,8 @@ #include "llvm/SymbolTable.h" #include "llvm/Type.h" #include "llvm/Analysis/ConstantsScanner.h" -#include "Support/PostOrderIterator.h" -#include "Support/STLExtras.h" +#include "llvm/ADT/PostOrderIterator.h" +#include "llvm/ADT/STLExtras.h" #include <algorithm> #include <functional> diff --git a/lib/Bytecode/Writer/Writer.cpp b/lib/Bytecode/Writer/Writer.cpp index 7db2148603..60a48cc265 100644 --- a/lib/Bytecode/Writer/Writer.cpp +++ b/lib/Bytecode/Writer/Writer.cpp @@ -25,8 +25,8 @@ #include "llvm/Module.h" #include "llvm/SymbolTable.h" #include "llvm/Support/GetElementPtrTypeIterator.h" -#include "Support/STLExtras.h" -#include "Support/Statistic.h" +#include "llvm/ADT/STLExtras.h" +#include "llvm/ADT/Statistic.h" #include <cstring> #include <algorithm> using namespace llvm; diff --git a/lib/Bytecode/Writer/WriterInternals.h b/lib/Bytecode/Writer/WriterInternals.h index e496da9ff8..8b5f99e94d 100644 --- a/lib/Bytecode/Writer/WriterInternals.h +++ b/lib/Bytecode/Writer/WriterInternals.h @@ -23,7 +23,7 @@ #include "llvm/Bytecode/Writer.h" #include "llvm/Bytecode/Format.h" #include "llvm/Instruction.h" -#include "Support/DataTypes.h" +#include "llvm/Support/DataTypes.h" #include <string> #include <vector> diff --git a/lib/CodeGen/BranchFolding.cpp b/lib/CodeGen/BranchFolding.cpp index af2b725017..cca9f93553 100644 --- a/lib/CodeGen/BranchFolding.cpp +++ b/lib/CodeGen/BranchFolding.cpp @@ -20,7 +20,7 @@ #include "llvm/CodeGen/MachineFunctionPass.h" #include "llvm/Target/TargetInstrInfo.h" #include "llvm/Target/TargetMachine.h" -#include "Support/STLExtras.h" +#include "llvm/ADT/STLExtras.h" using namespace llvm; namespace { diff --git a/lib/CodeGen/InstrSched/InstrScheduling.cpp b/lib/CodeGen/InstrSched/InstrScheduling.cpp index fc4d6a7164..69ecb90f31 100644 --- a/lib/CodeGen/InstrSched/InstrScheduling.cpp +++ b/lib/CodeGen/InstrSched/InstrScheduling.cpp @@ -20,7 +20,7 @@ #include "../../Target/SparcV9/MachineCodeForInstruction.h" #include "../../Target/SparcV9/LiveVar/FunctionLiveVarInfo.h" #include "../../Target/SparcV9/SparcV9InstrInfo.h" -#include "Support/CommandLine.h" +#include "llvm/Support/CommandLine.h" #include <algorithm> #include <iostream> diff --git a/lib/CodeGen/InstrSched/SchedGraph.cpp b/lib/CodeGen/InstrSched/SchedGraph.cpp index e3b3cba524..00b48d537d 100644 --- a/lib/CodeGen/InstrSched/SchedGraph.cpp +++ b/lib/CodeGen/InstrSched/SchedGraph.cpp @@ -22,7 +22,7 @@ #include "../../Target/SparcV9/MachineCodeForInstruction.h" #include "../../Target/SparcV9/SparcV9RegInfo.h" #include "../../Target/SparcV9/SparcV9InstrInfo.h" -#include "Support/STLExtras.h" +#include "llvm/ADT/STLExtras.h" #include <iostream> namespace llvm { diff --git a/lib/CodeGen/InstrSched/SchedGraph.h b/lib/CodeGen/InstrSched/SchedGraph.h index e327598bd5..53ded6377d 100644 --- a/lib/CodeGen/InstrSched/SchedGraph.h +++ b/lib/CodeGen/InstrSched/SchedGraph.h @@ -22,8 +22,8 @@ #include "llvm/CodeGen/SchedGraphCommon.h" #include "llvm/CodeGen/MachineInstr.h" #include "llvm/Transforms/Scalar.h" -#include "Support/hash_map" -#include "Support/GraphTraits.h" +#include "llvm/ADT/hash_map" +#include "llvm/ADT/GraphTraits.h" namespace llvm { diff --git a/lib/CodeGen/InstrSched/SchedGraphCommon.cpp b/lib/CodeGen/InstrSched/SchedGraphCommon.cpp index da4492f359..0ad5f5844e 100644 --- a/lib/CodeGen/InstrSched/SchedGraphCommon.cpp +++ b/lib/CodeGen/InstrSched/SchedGraphCommon.cpp @@ -13,7 +13,7 @@ //===----------------------------------------------------------------------===// #include "llvm/CodeGen/SchedGraphCommon.h" -#include "Support/STLExtras.h" +#include "llvm/ADT/STLExtras.h" #include <iostream> namespace llvm { diff --git a/lib/CodeGen/InstrSched/SchedPriorities.cpp b/lib/CodeGen/InstrSched/SchedPriorities.cpp index 3c0e0b2c33..0aaece228d 100644 --- a/lib/CodeGen/InstrSched/SchedPriorities.cpp +++ b/lib/CodeGen/InstrSched/SchedPriorities.cpp @@ -21,7 +21,7 @@ #include "../../Target/SparcV9/LiveVar/FunctionLiveVarInfo.h" #include "llvm/CodeGen/MachineBasicBlock.h" #include "llvm/Support/CFG.h" -#include "Support/PostOrderIterator.h" +#include "llvm/ADT/PostOrderIterator.h" #include <iostream> namespace llvm { diff --git a/lib/CodeGen/InstrSched/SchedPriorities.h b/lib/CodeGen/InstrSched/SchedPriorities.h index 7470467806..dd807f788e 100644 --- a/lib/CodeGen/InstrSched/SchedPriorities.h +++ b/lib/CodeGen/InstrSched/SchedPriorities.h @@ -23,7 +23,7 @@ #include "SchedGraph.h" #include "llvm/CodeGen/InstrScheduling.h" #include "llvm/Target/TargetSchedInfo.h" -#include "Support/hash_set" +#include "llvm/ADT/hash_set" #include <list> namespace llvm { diff --git a/lib/CodeGen/LiveInterval.cpp b/lib/CodeGen/LiveInterval.cpp index 6bd441f643..d63cfc60fb 100644 --- a/lib/CodeGen/LiveInterval.cpp +++ b/lib/CodeGen/LiveInterval.cpp @@ -19,7 +19,7 @@ //===----------------------------------------------------------------------===// #include "LiveInterval.h" -#include "Support/STLExtras.h" +#include "llvm/ADT/STLExtras.h" #include <iostream> #include <map> using namespace llvm; diff --git a/lib/CodeGen/LiveIntervalAnalysis.cpp b/lib/CodeGen/LiveIntervalAnalysis.cpp index 3c234bbd0e..95ed508fcb 100644 --- a/lib/CodeGen/LiveIntervalAnalysis.cpp +++ b/lib/CodeGen/LiveIntervalAnalysis.cpp @@ -27,10 +27,10 @@ #include "llvm/Target/MRegisterInfo.h" #include "llvm/Target/TargetInstrInfo.h" #include "llvm/Target/TargetMachine.h" -#include "Support/CommandLine.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" -#include "Support/STLExtras.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/STLExtras.h" #include "VirtRegMap.h" #include <cmath> diff --git a/lib/CodeGen/LiveVariables.cpp b/lib/CodeGen/LiveVariables.cpp index 630477d7b6..825b56d784 100644 --- a/lib/CodeGen/LiveVariables.cpp +++ b/lib/CodeGen/LiveVariables.cpp @@ -31,8 +31,8 @@ #include "llvm/Target/MRegisterInfo.h" #include "llvm/Target/TargetInstrInfo.h" #include "llvm/Target/TargetMachine.h" -#include "Support/DepthFirstIterator.h" -#include "Support/STLExtras.h" +#include "llvm/ADT/DepthFirstIterator.h" +#include "llvm/ADT/STLExtras.h" using namespace llvm; static RegisterAnalysis<LiveVariables> X("livevars", "Live Variable Analysis"); diff --git a/lib/CodeGen/MachineBasicBlock.cpp b/lib/CodeGen/MachineBasicBlock.cpp index 20390a2f50..f018f9f01f 100644 --- a/lib/CodeGen/MachineBasicBlock.cpp +++ b/lib/CodeGen/MachineBasicBlock.cpp @@ -17,7 +17,7 @@ #include "llvm/CodeGen/MachineInstr.h" #include "llvm/Target/TargetInstrInfo.h" #include "llvm/Target/TargetMachine.h" -#include "Support/LeakDetector.h" +#include "llvm/Support/LeakDetector.h" #include <iostream> using namespace llvm; diff --git a/lib/CodeGen/MachineFunction.cpp b/lib/CodeGen/MachineFunction.cpp index 3478e30e1f..e38e00603a 100644 --- a/lib/CodeGen/MachineFunction.cpp +++ b/lib/CodeGen/MachineFunction.cpp @@ -23,8 +23,8 @@ #include "llvm/Target/TargetFrameInfo.h" #include "llvm/Function.h" #include "llvm/Instructions.h" -#include "Support/LeakDetector.h" -#include "Support/GraphWriter.h" +#include "llvm/Support/LeakDetector.h" +#include "llvm/Support/GraphWriter.h" #include <fstream> #include <iostream> #include <sstream> diff --git a/lib/CodeGen/MachineInstr.cpp b/lib/CodeGen/MachineInstr.cpp index 7c5a61ecd1..a4ae09a649 100644 --- a/lib/CodeGen/MachineInstr.cpp +++ b/lib/CodeGen/MachineInstr.cpp @@ -20,7 +20,7 @@ #include "llvm/Target/TargetMachine.h" #include "llvm/Target/TargetInstrInfo.h" #include "llvm/Target/MRegisterInfo.h" -#include "Support/LeakDetector.h" +#include "llvm/Support/LeakDetector.h" #include <iostream> using namespace llvm; diff --git a/lib/CodeGen/ModuloScheduling/MSSchedule.cpp b/lib/CodeGen/ModuloScheduling/MSSchedule.cpp index c57cb5a3bd..b8bbccf8be 100644 --- a/lib/CodeGen/ModuloScheduling/MSSchedule.cpp +++ b/lib/CodeGen/ModuloScheduling/MSSchedule.cpp @@ -13,7 +13,7 @@ #define DEBUG_TYPE "ModuloSched" #include "MSSchedule.h" -#include "Support/Debug.h" +#include "llvm/Support/Debug.h" #include "llvm/Target/TargetSchedInfo.h" using namespace llvm; diff --git a/lib/CodeGen/ModuloScheduling/MSchedGraph.cpp b/lib/CodeGen/ModuloScheduling/MSchedGraph.cpp index 6bee44d934..5bdcc9afcf 100644 --- a/lib/CodeGen/ModuloScheduling/MSchedGraph.cpp +++ b/lib/CodeGen/ModuloScheduling/MSchedGraph.cpp @@ -16,7 +16,7 @@ #include "../../Target/SparcV9/SparcV9RegisterInfo.h" #include "llvm/CodeGen/MachineBasicBlock.h" #include "llvm/Target/TargetInstrInfo.h" -#include "Support/Debug.h" +#include "llvm/Support/Debug.h" #include <cstdlib> using namespace llvm; diff --git a/lib/CodeGen/ModuloScheduling/MSchedGraph.h b/lib/CodeGen/ModuloScheduling/MSchedGraph.h index 0dcbb496f1..4ea572a380 100644 --- a/lib/CodeGen/ModuloScheduling/MSchedGraph.h +++ b/lib/CodeGen/ModuloScheduling/MSchedGraph.h @@ -16,9 +16,9 @@ #include "llvm/CodeGen/MachineInstr.h" #include "llvm/Target/TargetMachine.h" -#include "Support/GraphTraits.h" -#include "Support/STLExtras.h" -#include "Support/iterator" +#include "llvm/ADT/GraphTraits.h" +#include "llvm/ADT/STLExtras.h" +#include "llvm/ADT/iterator" #include <vector> namespace llvm { diff --git a/lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp b/lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp index dadc38570c..9ad1e4ce4b 100644 --- a/lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp +++ b/lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp @@ -21,9 +21,9 @@ #include "llvm/CodeGen/Passes.h" #include "llvm/Support/CFG.h" #include "llvm/Target/TargetSchedInfo.h" -#include "Support/Debug.h" -#include "Support/GraphWriter.h" -#include "Support/StringExtras.h" +#include "llvm/Support/Debug.h" +#include "llvm/Support/GraphWriter.h" +#include "llvm/ADT/StringExtras.h" #include <cmath> #include <fstream> #include <sstream> diff --git a/lib/CodeGen/PHIElimination.cpp b/lib/CodeGen/PHIElimination.cpp index 4df9a92bb4..0010ccd7e6 100644 --- a/lib/CodeGen/PHIElimination.cpp +++ b/lib/CodeGen/PHIElimination.cpp @@ -20,8 +20,8 @@ #include "llvm/CodeGen/LiveVariables.h" #include "llvm/Target/TargetInstrInfo.h" #include "llvm/Target/TargetMachine.h" -#include "Support/DenseMap.h" -#include "Support/STLExtras.h" +#include "llvm/ADT/DenseMap.h" +#include "llvm/ADT/STLExtras.h" using namespace llvm; namespace { diff --git a/lib/CodeGen/Passes.cpp b/lib/CodeGen/Passes.cpp index 7233e81473..4d2f111b2e 100644 --- a/lib/CodeGen/Passes.cpp +++ b/lib/CodeGen/Passes.cpp @@ -13,7 +13,7 @@ //===---------------------------------------------------------------------===// #include "llvm/CodeGen/Passes.h" -#include "Support/CommandLine.h" +#include "llvm/Support/CommandLine.h" #include <iostream> using namespace llvm; diff --git a/lib/CodeGen/RegAllocIterativeScan.cpp b/lib/CodeGen/RegAllocIterativeScan.cpp index ffeb68d9dd..26fa7b7655 100644 --- a/lib/CodeGen/RegAllocIterativeScan.cpp +++ b/lib/CodeGen/RegAllocIterativeScan.cpp @@ -25,9 +25,9 @@ #include "llvm/CodeGen/SSARegMap.h" #include "llvm/Target/MRegisterInfo.h" #include "llvm/Target/TargetMachine.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" -#include "Support/STLExtras.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/STLExtras.h" #include "LiveIntervalAnalysis.h" #include "PhysRegTracker.h" #include "VirtRegMap.h" diff --git a/lib/CodeGen/RegAllocLinearScan.cpp b/lib/CodeGen/RegAllocLinearScan.cpp index 181f061986..8736a23675 100644 --- a/lib/CodeGen/RegAllocLinearScan.cpp +++ b/lib/CodeGen/RegAllocLinearScan.cpp @@ -19,9 +19,9 @@ #include "llvm/CodeGen/SSARegMap.h" #include "llvm/Target/MRegisterInfo.h" #include "llvm/Target/TargetMachine.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" -#include "Support/STLExtras.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/STLExtras.h" #include "LiveIntervalAnalysis.h" #include "PhysRegTracker.h" #include "VirtRegMap.h" diff --git a/lib/CodeGen/RegAllocLocal.cpp b/lib/CodeGen/RegAllocLocal.cpp index 482325fbff..2cf8e6327e 100644 --- a/lib/CodeGen/RegAllocLocal.cpp +++ b/lib/CodeGen/RegAllocLocal.cpp @@ -21,10 +21,10 @@ #include "llvm/CodeGen/LiveVariables.h" #include "llvm/Target/TargetInstrInfo.h" #include "llvm/Target/TargetMachine.h" -#include "Support/CommandLine.h" -#include "Support/Debug.h" -#include "Support/DenseMap.h" -#include "Support/Statistic.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/DenseMap.h" +#include "llvm/ADT/Statistic.h" using namespace llvm; namespace { diff --git a/lib/CodeGen/RegAllocSimple.cpp b/lib/CodeGen/RegAllocSimple.cpp index 6f6c2c6352..ba05bd3830 100644 --- a/lib/CodeGen/RegAllocSimple.cpp +++ b/lib/CodeGen/RegAllocSimple.cpp @@ -22,9 +22,9 @@ #include "llvm/CodeGen/MachineFrameInfo.h" #include "llvm/Target/TargetInstrInfo.h" #include "llvm/Target/TargetMachine.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" -#include "Support/STLExtras.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/STLExtras.h" using namespace llvm; namespace { diff --git a/lib/CodeGen/TwoAddressInstructionPass.cpp b/lib/CodeGen/TwoAddressInstructionPass.cpp index 0268d4b01a..e3e79f01f5 100644 --- a/lib/CodeGen/TwoAddressInstructionPass.cpp +++ b/lib/CodeGen/TwoAddressInstructionPass.cpp @@ -37,9 +37,9 @@ #include "llvm/Target/MRegisterInfo.h" #include "llvm/Target/TargetInstrInfo.h" #include "llvm/Target/TargetMachine.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" -#include "Support/STLExtras.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/STLExtras.h" using namespace llvm; namespace { diff --git a/lib/CodeGen/UnreachableBlockElim.cpp b/lib/CodeGen/UnreachableBlockElim.cpp index 27355ec6d3..0bde9ff23a 100644 --- a/lib/CodeGen/UnreachableBlockElim.cpp +++ b/lib/CodeGen/UnreachableBlockElim.cpp @@ -26,7 +26,7 @@ #include "llvm/Function.h" #include "llvm/Pass.h" #include "llvm/Support/CFG.h" -#include "Support/DepthFirstIterator.h" +#include "llvm/ADT/DepthFirstIterator.h" using namespace llvm; namespace { diff --git a/lib/CodeGen/VirtRegMap.cpp b/lib/CodeGen/VirtRegMap.cpp index c235aada9f..cffe77c518 100644 --- a/lib/CodeGen/VirtRegMap.cpp +++ b/lib/CodeGen/VirtRegMap.cpp @@ -22,11 +22,11 @@ #include "llvm/CodeGen/MachineInstr.h" #include "llvm/Target/TargetMachine.h" #include "llvm/Target/TargetInstrInfo.h" -#include "Support/CommandLine.h" -#include "Support/Debug.h" -#include "Support/DenseMap.h" -#include "Support/Statistic.h" -#include "Support/STLExtras.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/DenseMap.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/STLExtras.h" using namespace llvm; diff --git a/lib/CodeGen/VirtRegMap.h b/lib/CodeGen/VirtRegMap.h index c76a222341..fb694d5e1a 100644 --- a/lib/CodeGen/VirtRegMap.h +++ b/lib/CodeGen/VirtRegMap.h @@ -20,7 +20,7 @@ #include "llvm/CodeGen/MachineFunction.h" #include "llvm/CodeGen/SSARegMap.h" -#include "Support/DenseMap.h" +#include "llvm/ADT/DenseMap.h" #include <climits> #include <map> diff --git a/lib/Debugger/Debugger.cpp b/lib/Debugger/Debugger.cpp index 02c4a8a491..76cdfa2014 100644 --- a/lib/Debugger/Debugger.cpp +++ b/lib/Debugger/Debugger.cpp @@ -16,7 +16,7 @@ #include "llvm/ModuleProvider.h" #include "llvm/Bytecode/Reader.h" #include "llvm/Debugger/InferiorProcess.h" -#include "Support/StringExtras.h" +#include "llvm/ADT/StringExtras.h" using namespace llvm; /// Debugger constructor - Initialize the debugger to its initial, empty, state. diff --git a/lib/Debugger/ProgramInfo.cpp b/lib/Debugger/ProgramInfo.cpp index 8bb8738c65..d6a4532b4f 100644 --- a/lib/Debugger/ProgramInfo.cpp +++ b/lib/Debugger/ProgramInfo.cpp @@ -20,9 +20,9 @@ #include "llvm/Module.h" #include "llvm/Debugger/SourceFile.h" #include "llvm/Debugger/SourceLanguage.h" -#include "Support/FileUtilities.h" -#include "Support/SlowOperationInformer.h" -#include "Support/STLExtras.h" +#include "llvm/Support/FileUtilities.h" +#include "llvm/Support/SlowOperationInformer.h" +#include "llvm/ADT/STLExtras.h" #include <iostream> using namespace llvm; diff --git a/lib/Debugger/SourceFile.cpp b/lib/Debugger/SourceFile.cpp index 2eb3b5750b..f0bd0d8a22 100644 --- a/lib/Debugger/SourceFile.cpp +++ b/lib/Debugger/SourceFile.cpp @@ -12,8 +12,8 @@ //===----------------------------------------------------------------------===// #include "llvm/Debugger/SourceFile.h" -#include "Support/SlowOperationInformer.h" -#include "Support/FileUtilities.h" +#include "llvm/Support/SlowOperationInformer.h" +#include "llvm/Support/FileUtilities.h" #include <iostream> #include <cerrno> #include <fcntl.h> diff --git a/lib/Debugger/UnixLocalInferiorProcess.cpp b/lib/Debugger/UnixLocalInferiorProcess.cpp index 1cacb534a2..437b21864e 100644 --- a/lib/Debugger/UnixLocalInferiorProcess.cpp +++ b/lib/Debugger/UnixLocalInferiorProcess.cpp @@ -32,8 +32,8 @@ #include "llvm/CodeGen/IntrinsicLowering.h" #include "llvm/ExecutionEngine/GenericValue.h" #include "llvm/ExecutionEngine/ExecutionEngine.h" -#include "Support/FileUtilities.h" -#include "Support/StringExtras.h" +#include "llvm/Support/FileUtilities.h" +#include "llvm/ADT/StringExtras.h" #include <cerrno> #include <csignal> #include <unistd.h> // Unix-specific debugger support diff --git a/lib/ExecutionEngine/ExecutionEngine.cpp b/lib/ExecutionEngine/ExecutionEngine.cpp index 105c0b8a1d..b239cc2a53 100644 --- a/lib/ExecutionEngine/ExecutionEngine.cpp +++ b/lib/ExecutionEngine/ExecutionEngine.cpp @@ -23,9 +23,9 @@ #include "llvm/ExecutionEngine/ExecutionEngine.h" #include "llvm/ExecutionEngine/GenericValue.h" #include "llvm/Target/TargetData.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" -#include "Support/DynamicLinker.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/Support/DynamicLinker.h" using namespace llvm; namespace { diff --git a/lib/ExecutionEngine/Interpreter/Execution.cpp b/lib/ExecutionEngine/Interpreter/Execution.cpp index 705fc16db8..5e1ae0629f 100644 --- a/lib/ExecutionEngine/Interpreter/Execution.cpp +++ b/lib/ExecutionEngine/Interpreter/Execution.cpp @@ -18,8 +18,8 @@ #include "llvm/Instructions.h" #include "llvm/CodeGen/IntrinsicLowering.h" #include "llvm/Support/GetElementPtrTypeIterator.h" -#include "Support/Statistic.h" -#include "Support/Debug.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/Support/Debug.h" #include <cmath> // For fmod using namespace llvm; diff --git a/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp b/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp index 83da7551b0..def406a4b7 100644 --- a/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp +++ b/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp @@ -23,7 +23,7 @@ #include "llvm/DerivedTypes.h" #include "llvm/Module.h" #include "llvm/Target/TargetData.h" -#include "Support/DynamicLinker.h" +#include "llvm/Support/DynamicLinker.h" #include <cmath> #include <csignal> #include <map> diff --git a/lib/ExecutionEngine/Interpreter/Interpreter.h b/lib/ExecutionEngine/Interpreter/Interpreter.h index 99e417c4a8..d6e590d735 100644 --- a/lib/ExecutionEngine/Interpreter/Interpreter.h +++ b/lib/ExecutionEngine/Interpreter/Interpreter.h @@ -20,7 +20,7 @@ #include "llvm/Support/InstVisitor.h" #include "llvm/Support/CallSite.h" #include "llvm/Target/TargetData.h" -#include "Support/DataTypes.h" +#include "llvm/Support/DataTypes.h" #include <iostream> namespace llvm { diff --git a/lib/ExecutionEngine/JIT/Intercept.cpp b/lib/ExecutionEngine/JIT/Intercept.cpp index 8ed9447159..2eafb75cd0 100644 --- a/lib/ExecutionEngine/JIT/Intercept.cpp +++ b/lib/ExecutionEngine/JIT/Intercept.cpp @@ -16,7 +16,7 @@ //===----------------------------------------------------------------------===// #include "JIT.h" -#include "Support/DynamicLinker.h" +#include "llvm/Support/DynamicLinker.h" #include <iostream> #include <sys/stat.h> using namespace llvm; diff --git a/lib/ExecutionEngine/JIT/JIT.cpp b/lib/ExecutionEngine/JIT/JIT.cpp index 675ef479d1..311ec4b47d 100644 --- a/lib/ExecutionEngine/JIT/JIT.cpp +++ b/lib/ExecutionEngine/JIT/JIT.cpp @@ -24,7 +24,7 @@ #include "llvm/ExecutionEngine/GenericValue.h" #include "llvm/Target/TargetMachine.h" #include "llvm/Target/TargetJITInfo.h" -#include "Support/DynamicLinker.h" +#include "llvm/Support/DynamicLinker.h" #include <iostream> using namespace llvm; diff --git a/lib/ExecutionEngine/JIT/JITEmitter.cpp b/lib/ExecutionEngine/JIT/JITEmitter.cpp index 7065c56a46..5758ebc432 100644 --- a/lib/ExecutionEngine/JIT/JITEmitter.cpp +++ b/lib/ExecutionEngine/JIT/JITEmitter.cpp @@ -20,9 +20,9 @@ #include "llvm/CodeGen/MachineFunction.h" #include "llvm/CodeGen/MachineConstantPool.h" #include "llvm/Target/TargetData.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" -#include "Support/SystemUtils.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/Support/SystemUtils.h" using namespace llvm; namespace { diff --git a/lib/Linker/LinkArchives.cpp b/lib/Linker/LinkArchives.cpp index fcaa7af3d5..fa9ec70306 100644 --- a/lib/Linker/LinkArchives.cpp +++ b/lib/Linker/LinkArchives.cpp @@ -21,11 +21,11 @@ #include "llvm/Transforms/IPO.h" #include "llvm/Transforms/Scalar.h" #include "llvm/Support/Linker.h" -#include "Config/config.h" -#include "Support/CommandLine.h" -#include "Support/FileUtilities.h" +#include "llvm/Config/config.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/FileUtilities.h" #include "llvm/System/Signals.h" -#include "Support/SystemUtils.h" +#include "llvm/Support/SystemUtils.h" #include <algorithm> #include <fstream> #include <memory> diff --git a/lib/Support/Annotation.cpp b/lib/Support/Annotation.cpp index 45fd06f92e..c8cf8298b4 100644 --- a/lib/Support/Annotation.cpp +++ b/lib/Support/Annotation.cpp @@ -12,7 +12,7 @@ //===----------------------------------------------------------------------===// #include <map> -#include "Support/Annotation.h" +#include "llvm/Support/Annotation.h" using namespace llvm; Annotation::~Annotation() {} // Designed to be subclassed diff --git a/lib/Support/CommandLine.cpp b/lib/Support/CommandLine.cpp index 3bc9cbf1ca..d60b464dd5 100644 --- a/lib/Support/CommandLine.cpp +++ b/lib/Support/CommandLine.cpp @@ -16,8 +16,8 @@ // //===----------------------------------------------------------------------===// -#include "Config/config.h" -#include "Support/CommandLine.h" +#include "llvm/Config/config.h" +#include "llvm/Support/CommandLine.h" #include <algorithm> #include <map> #include <set> diff --git a/lib/Support/Debug.cpp b/lib/Support/Debug.cpp index f171342949..a58716763a 100644 --- a/lib/Support/Debug.cpp +++ b/lib/Support/Debug.cpp @@ -23,8 +23,8 @@ // //===----------------------------------------------------------------------===// -#include "Support/Debug.h" -#include "Support/CommandLine.h" +#include "llvm/Support/Debug.h" +#include "llvm/Support/CommandLine.h" using namespace llvm; bool llvm::DebugFlag; // DebugFlag - Exported boolean set by the -debug option diff --git a/lib/Support/DynamicLinker.cpp b/lib/Support/DynamicLinker.cpp index 4ac58c1bbc..a6593034c7 100644 --- a/lib/Support/DynamicLinker.cpp +++ b/lib/Support/DynamicLinker.cpp @@ -18,9 +18,9 @@ // //===----------------------------------------------------------------------===// -#include "Support/DynamicLinker.h" -#include "Config/dlfcn.h" -#include "Config/windows.h" +#include "llvm/Support/DynamicLinker.h" +#include "llvm/Config/dlfcn.h" +#include "llvm/Config/windows.h" #include <cassert> #include <vector> using namespace llvm; diff --git a/lib/Support/FileUtilities.cpp b/lib/Support/FileUtilities.cpp index 09542c3fab..6829f155b8 100644 --- a/lib/Support/FileUtilities.cpp +++ b/lib/Support/FileUtilities.cpp @@ -12,14 +12,14 @@ // //===----------------------------------------------------------------------===// -#include "Support/FileUtilities.h" -#include "Support/DataTypes.h" -#include "Config/unistd.h" -#include "Config/fcntl.h" -#include "Config/sys/types.h" -#include "Config/sys/stat.h" -#include "Config/sys/mman.h" -#include "Config/alloca.h" +#include "llvm/Support/FileUtilities.h" +#include "llvm/Support/DataTypes.h" +#include "llvm/Config/unistd.h" +#include "llvm/Config/fcntl.h" +#include "llvm/Config/sys/types.h" +#include "llvm/Config/sys/stat.h" +#include "llvm/Config/sys/mman.h" +#include "llvm/Config/alloca.h" #include <cerrno> #include <cstdio> #include <fstream> diff --git a/lib/Support/IsInf.cpp b/lib/Support/IsInf.cpp index 7fd857e931..c50eadff17 100644 --- a/lib/Support/IsInf.cpp +++ b/lib/Support/IsInf.cpp @@ -11,7 +11,7 @@ // //===----------------------------------------------------------------------===// -#include "Config/config.h" +#include "llvm/Config/config.h" #if HAVE_ISINF_IN_MATH_H # include <math.h> #elif HAVE_ISINF_IN_CMATH diff --git a/lib/Support/IsNAN.cpp b/lib/Support/IsNAN.cpp index ade6bf1dc8..75c813f41a 100644 --- a/lib/Support/IsNAN.cpp +++ b/lib/Support/IsNAN.cpp @@ -11,7 +11,7 @@ // //===----------------------------------------------------------------------===// -#include "Config/config.h" +#include "llvm/Config/config.h" #if HAVE_ISNAN_IN_MATH_H # include <math.h> #elif HAVE_ISNAN_IN_CMATH diff --git a/lib/Support/PluginLoader.cpp b/lib/Support/PluginLoader.cpp index cbec6fa7d4..2c13d57812 100644 --- a/lib/Support/PluginLoader.cpp +++ b/lib/Support/PluginLoader.cpp @@ -12,8 +12,8 @@ //===----------------------------------------------------------------------===// #define DONT_GET_PLUGIN_LOADER_OPTION -#include "Support/PluginLoader.h" -#include "Support/DynamicLinker.h" +#include "llvm/Support/PluginLoader.h" +#include "llvm/Support/DynamicLinker.h" #include <iostream> using namespace llvm; diff --git a/lib/Support/SlowOperationInformer.cpp b/lib/Support/SlowOperationInformer.cpp index c245f3655c..43faaadaae 100644 --- a/lib/Support/SlowOperationInformer.cpp +++ b/lib/Support/SlowOperationInformer.cpp @@ -11,8 +11,8 @@ // //===----------------------------------------------------------------------===// -#include "Support/SlowOperationInformer.h" -#include "Config/config.h" // Get the signal handler return type +#include "llvm/Support/SlowOperationInformer.h" +#include "llvm/Config/config.h" // Get the signal handler return type #include <iostream> #include <sstream> #include <signal.h> diff --git a/lib/Support/Statistic.cpp b/lib/Support/Statistic.cpp index 7fa7547fee..f4d9c7b9e2 100644 --- a/lib/Support/Statistic.cpp +++ b/lib/Support/Statistic.cpp @@ -21,8 +21,8 @@ // //===----------------------------------------------------------------------===// -#include "Support/Statistic.h" -#include "Support/CommandLine.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/Support/CommandLine.h" #include <sstream> #include <iostream> #include <algorithm> diff --git a/lib/Support/StringExtras.cpp b/lib/Support/StringExtras.cpp index 011ce280f0..e8d423a74d 100644 --- a/lib/Support/StringExtras.cpp +++ b/lib/Support/StringExtras.cpp @@ -11,7 +11,7 @@ // //===----------------------------------------------------------------------===// -#include "Support/StringExtras.h" +#include "llvm/ADT/StringExtras.h" using namespace llvm; /// getToken - This function extracts one token from source, ignoring any diff --git a/lib/Support/SystemUtils.cpp b/lib/Support/SystemUtils.cpp index b831f4096d..3b529df79c 100644 --- a/lib/Support/SystemUtils.cpp +++ b/lib/Support/SystemUtils.cpp @@ -13,15 +13,15 @@ //===----------------------------------------------------------------------===// #define _POSIX_MAPPED_FILES -#include "Support/SystemUtils.h" -#include "Config/fcntl.h" -#include "Config/pagesize.h" -#include "Config/unistd.h" -#include "Config/windows.h" -#include "Config/sys/mman.h" -#include "Config/sys/stat.h" -#include "Config/sys/types.h" -#include "Config/sys/wait.h" +#include "llvm/Support/SystemUtils.h" +#include "llvm/Config/fcntl.h" +#include "llvm/Config/pagesize.h" +#include "llvm/Config/unistd.h" +#include "llvm/Config/windows.h" +#include "llvm/Config/sys/mman.h" +#include "llvm/Config/sys/stat.h" +#include "llvm/Config/sys/types.h" +#include "llvm/Config/sys/wait.h" #include <algorithm> #include <cerrno> #include <cstdlib> diff --git a/lib/Support/Timer.cpp b/lib/Support/Timer.cpp index 52b616fa2c..ff3fd6fefe 100644 --- a/lib/Support/Timer.cpp +++ b/lib/Support/Timer.cpp @@ -11,18 +11,18 @@ // //===----------------------------------------------------------------------===// -#include "Support/Timer.h" -#include "Support/CommandLine.h" +#include "llvm/Support/Timer.h" +#include "llvm/Support/CommandLine.h" #include <algorithm> #include <iostream> #include <functional> #include <fstream> #include <map> -#include "Config/sys/resource.h" -#include "Config/sys/time.h" -#include "Config/unistd.h" -#include "Config/malloc.h" -#include "Config/windows.h" +#include "llvm/Config/sys/resource.h" +#include "llvm/Config/sys/time.h" +#include "llvm/Config/unistd.h" +#include "llvm/Config/malloc.h" +#include "llvm/Config/windows.h" using namespace llvm; // GetLibSupportInfoOutputFile - Return a file stream to print our output on. diff --git a/lib/Support/ToolRunner.cpp b/lib/Support/ToolRunner.cpp index b694127e07..3dc98451de 100644 --- a/lib/Support/ToolRunner.cpp +++ b/lib/Support/ToolRunner.cpp @@ -13,9 +13,9 @@ #define DEBUG_TYPE "toolrunner" #include "llvm/Support/ToolRunner.h" -#include "Config/config.h" // for HAVE_LINK_R -#include "Support/Debug.h" -#include "Support/FileUtilities.h" +#include "llvm/Config/config.h" // for HAVE_LINK_R +#include "llvm/Support/Debug.h" +#include "llvm/Support/FileUtilities.h" #include <fstream> #include <sstream> using namespace llvm; diff --git a/lib/System/Unix/Path.cpp b/lib/System/Unix/Path.cpp index 9a860a0672..49b2bf4afe 100644 --- a/lib/System/Unix/Path.cpp +++ b/lib/System/Unix/Path.cpp @@ -16,10 +16,10 @@ //=== is guaranteed to work on *all* UNIX variants. //===----------------------------------------------------------------------===// +#include <llvm/Config/config.h> #include "Unix.h" #include <sys/stat.h> #include <fcntl.h> -#include <Config/config.h> namespace llvm { using namespace sys; diff --git a/lib/System/Unix/Path.inc b/lib/System/Unix/Path.inc index 9a860a0672..49b2bf4afe 100644 --- a/lib/System/Unix/Path.inc +++ b/lib/System/Unix/Path.inc @@ -16,10 +16,10 @@ //=== is guaranteed to work on *all* UNIX variants. //===----------------------------------------------------------------------===// +#include <llvm/Config/config.h> #include "Unix.h" #include <sys/stat.h> #include <fcntl.h> -#include <Config/config.h> namespace llvm { using namespace sys; diff --git a/lib/System/Unix/Program.cpp b/lib/System/Unix/Program.cpp index ca8514dfa6..b8ef55925d 100644 --- a/lib/System/Unix/Program.cpp +++ b/lib/System/Unix/Program.cpp @@ -16,10 +16,10 @@ //=== is guaranteed to work on *all* UNIX variants. //===----------------------------------------------------------------------===// +#include <llvm/Config/config.h> #include "Unix.h" #include <sys/stat.h> #include <fcntl.h> -#include <Config/config.h> #ifdef HAVE_SYS_WAIT_H #include <sys/wait.h> #endif diff --git a/lib/System/Unix/Program.inc b/lib/System/Unix/Program.inc index ca8514dfa6..b8ef55925d 100644 --- a/lib/System/Unix/Program.inc +++ b/lib/System/Unix/Program.inc @@ -16,10 +16,10 @@ //=== is guaranteed to work on *all* UNIX variants. //===----------------------------------------------------------------------===// +#include <llvm/Config/config.h> #include "Unix.h" #include <sys/stat.h> #include <fcntl.h> -#include <Config/config.h> #ifdef HAVE_SYS_WAIT_H #include <sys/wait.h> #endif diff --git a/lib/System/Unix/Unix.h b/lib/System/Unix/Unix.h index aa6bfb1a78..b9eff46c46 100644 --- a/lib/System/Unix/Unix.h +++ b/lib/System/Unix/Unix.h @@ -16,7 +16,7 @@ //=== is guaranteed to work on all UNIX variants. //===----------------------------------------------------------------------===// -#include "Config/config.h" // Get autoconf configuration settings +#include "llvm/Config/config.h" // Get autoconf configuration settings #include <unistd.h> #include <cstdlib> #include <cstdio> diff --git a/lib/Target/CBackend/CBackend.cpp b/lib/Target/CBackend/CBackend.cpp index b8208d4a4c..45a771f9df 100644 --- a/lib/Target/CBackend/CBackend.cpp +++ b/lib/Target/CBackend/CBackend.cpp @@ -32,9 +32,9 @@ #include "llvm/Support/GetElementPtrTypeIterator.h" #include "llvm/Support/InstVisitor.h" #include "llvm/Support/Mangler.h" -#include "Support/StringExtras.h" -#include "Support/MathExtras.h" -#include "Config/config.h" +#include "llvm/ADT/StringExtras.h" +#include "llvm/Support/MathExtras.h" +#include "llvm/Config/config.h" #include <algorithm> #include <iostream> #include <sstream> diff --git a/lib/Target/CBackend/Writer.cpp b/lib/Target/CBackend/Writer.cpp index b8208d4a4c..45a771f9df 100644 --- a/lib/Target/CBackend/Writer.cpp +++ b/lib/Target/CBackend/Writer.cpp @@ -32,9 +32,9 @@ #include "llvm/Support/GetElementPtrTypeIterator.h" #include "llvm/Support/InstVisitor.h" #include "llvm/Support/Mangler.h" -#include "Support/StringExtras.h" -#include "Support/MathExtras.h" -#include "Config/config.h" +#include "llvm/ADT/StringExtras.h" +#include "llvm/Support/MathExtras.h" +#include "llvm/Config/config.h" #include <algorithm> #include <iostream> #include <sstream> diff --git a/lib/Target/PowerPC/PPC32AsmPrinter.cpp b/lib/Target/PowerPC/PPC32AsmPrinter.cpp index 2358f1608a..b30977b1a1 100644 --- a/lib/Target/PowerPC/PPC32AsmPrinter.cpp +++ b/lib/Target/PowerPC/PPC32AsmPrinter.cpp @@ -29,10 +29,10 @@ #include "llvm/CodeGen/MachineInstr.h" #include "llvm/CodeGen/ValueTypes.h" #include "llvm/Support/Mangler.h" -#include "Support/CommandLine.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" -#include "Support/StringExtras.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/StringExtras.h" #include <set> using namespace llvm; diff --git a/lib/Target/PowerPC/PPC32ISelSimple.cpp b/lib/Target/PowerPC/PPC32ISelSimple.cpp index 923e8d57bc..5ba7a5beeb 100644 --- a/lib/Target/PowerPC/PPC32ISelSimple.cpp +++ b/lib/Target/PowerPC/PPC32ISelSimple.cpp @@ -26,8 +26,8 @@ #include "llvm/Target/TargetMachine.h" #include "llvm/Support/GetElementPtrTypeIterator.h" #include "llvm/Support/InstVisitor.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" #include <vector> using namespace llvm; diff --git a/lib/Target/PowerPC/PPC64AsmPrinter.cpp b/lib/Target/PowerPC/PPC64AsmPrinter.cpp index 74aaad5b15..972fa01bb9 100644 --- a/lib/Target/PowerPC/PPC64AsmPrinter.cpp +++ b/lib/Target/PowerPC/PPC64AsmPrinter.cpp @@ -25,11 +25,11 @@ #include "llvm/CodeGen/MachineFunctionPass.h" #include "llvm/CodeGen/MachineInstr.h" #include "llvm/Support/Mangler.h" -#include "Support/CommandLine.h" -#include "Support/Debug.h" -#include "Support/MathExtras.h" -#include "Support/Statistic.h" -#include "Support/StringExtras.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/Debug.h" +#include "llvm/Support/MathExtras.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/StringExtras.h" #include <set> namespace llvm { diff --git a/lib/Target/PowerPC/PPC64ISelSimple.cpp b/lib/Target/PowerPC/PPC64ISelSimple.cpp index 637e8565b2..107266ed62 100644 --- a/lib/Target/PowerPC/PPC64ISelSimple.cpp +++ b/lib/Target/PowerPC/PPC64ISelSimple.cpp @@ -26,8 +26,8 @@ #include "llvm/Target/TargetMachine.h" #include "llvm/Support/GetElementPtrTypeIterator.h" #include "llvm/Support/InstVisitor.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" #include <vector> using namespace llvm; diff --git a/lib/Target/PowerPC/PPC64RegisterInfo.cpp b/lib/Target/PowerPC/PPC64RegisterInfo.cpp index 774e661e62..1871c2e315 100644 --- a/lib/Target/PowerPC/PPC64RegisterInfo.cpp +++ b/lib/Target/PowerPC/PPC64RegisterInfo.cpp @@ -24,9 +24,9 @@ #include "llvm/Target/TargetFrameInfo.h" #include "llvm/Target/TargetMachine.h" #include "llvm/Target/TargetOptions.h" -#include "Support/CommandLine.h" -#include "Support/Debug.h" -#include "Support/STLExtras.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/STLExtras.h" #include <cstdlib> #include <iostream> using namespace llvm; diff --git a/lib/Target/PowerPC/PPCAsmPrinter.cpp b/lib/Target/PowerPC/PPCAsmPrinter.cpp index 2358f1608a..b30977b1a1 100644 --- a/lib/Target/PowerPC/PPCAsmPrinter.cpp +++ b/lib/Target/PowerPC/PPCAsmPrinter.cpp @@ -29,10 +29,10 @@ #include "llvm/CodeGen/MachineInstr.h" #include "llvm/CodeGen/ValueTypes.h" #include "llvm/Support/Mangler.h" -#include "Support/CommandLine.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" -#include "Support/StringExtras.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/StringExtras.h" #include <set> using namespace llvm; diff --git a/lib/Target/PowerPC/PPCBranchSelector.cpp b/lib/Target/PowerPC/PPCBranchSelector.cpp index e2456c9320..6f7b597da3 100644 --- a/lib/Target/PowerPC/PPCBranchSelector.cpp +++ b/lib/Target/PowerPC/PPCBranchSelector.cpp @@ -22,7 +22,7 @@ #include "PPC32InstrInfo.h" #include "llvm/CodeGen/MachineFunctionPass.h" #include "llvm/CodeGen/MachineFunction.h" -#include "Support/Debug.h" +#include "llvm/Support/Debug.h" #include <map> using namespace llvm; diff --git a/lib/Target/PowerPC/PPCCodeEmitter.cpp b/lib/Target/PowerPC/PPCCodeEmitter.cpp index b8eb6b6714..b08ce92d99 100644 --- a/lib/Target/PowerPC/PPCCodeEmitter.cpp +++ b/lib/Target/PowerPC/PPCCodeEmitter.cpp @@ -15,7 +15,7 @@ #include "llvm/CodeGen/MachineCodeEmitter.h" #include "llvm/CodeGen/MachineFunctionPass.h" #include "llvm/CodeGen/Passes.h" -#include "Support/Debug.h" +#include "llvm/Support/Debug.h" namespace llvm { diff --git a/lib/Target/PowerPC/PPCRegisterInfo.cpp b/lib/Target/PowerPC/PPCRegisterInfo.cpp index bebb868841..321a44939b 100644 --- a/lib/Target/PowerPC/PPCRegisterInfo.cpp +++ b/lib/Target/PowerPC/PPCRegisterInfo.cpp @@ -24,9 +24,9 @@ #include "llvm/Target/TargetFrameInfo.h" #include "llvm/Target/TargetMachine.h" #include "llvm/Target/TargetOptions.h" -#include "Support/CommandLine.h" -#include "Support/Debug.h" -#include "Support/STLExtras.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/STLExtras.h" #include <cstdlib> #include <iostream> using namespace llvm; diff --git a/lib/Target/PowerPC/PPCTargetMachine.cpp b/lib/Target/PowerPC/PPCTargetMachine.cpp index fa2455cc87..f9f1cb4a53 100644 --- a/lib/Target/PowerPC/PPCTargetMachine.cpp +++ b/lib/Target/PowerPC/PPCTargetMachine.cpp @@ -25,7 +25,7 @@ #include "llvm/Target/TargetOptions.h" #include "llvm/Target/TargetMachineRegistry.h" #include "llvm/Transforms/Scalar.h" -#include "Support/CommandLine.h" +#include "llvm/Support/CommandLine.h" #include <iostream> using namespace llvm; diff --git a/lib/Target/SparcV9/InstrSched/InstrScheduling.cpp b/lib/Target/SparcV9/InstrSched/InstrScheduling.cpp index fc4d6a7164..69ecb90f31 100644 --- a/lib/Target/SparcV9/InstrSched/InstrScheduling.cpp +++ b/lib/Target/SparcV9/InstrSched/InstrScheduling.cpp @@ -20,7 +20,7 @@ #include "../../Target/SparcV9/MachineCodeForInstruction.h" #include "../../Target/SparcV9/LiveVar/FunctionLiveVarInfo.h" #include "../../Target/SparcV9/SparcV9InstrInfo.h" -#include "Support/CommandLine.h" +#include "llvm/Support/CommandLine.h" #include <algorithm> #include <iostream> diff --git a/lib/Target/SparcV9/InstrSched/SchedGraph.cpp b/lib/Target/SparcV9/InstrSched/SchedGraph.cpp index e3b3cba524..00b48d537d 100644 --- a/lib/Target/SparcV9/InstrSched/SchedGraph.cpp +++ b/lib/Target/SparcV9/InstrSched/SchedGraph.cpp @@ -22,7 +22,7 @@ #include "../../Target/SparcV9/MachineCodeForInstruction.h" #include "../../Target/SparcV9/SparcV9RegInfo.h" #include "../../Target/SparcV9/SparcV9InstrInfo.h" -#include "Support/STLExtras.h" +#include "llvm/ADT/STLExtras.h" #include <iostream> namespace llvm { diff --git a/lib/Target/SparcV9/InstrSched/SchedGraph.h b/lib/Target/SparcV9/InstrSched/SchedGraph.h index e327598bd5..53ded6377d 100644 --- a/lib/Target/SparcV9/InstrSched/SchedGraph.h +++ b/lib/Target/SparcV9/InstrSched/SchedGraph.h @@ -22,8 +22,8 @@ #include "llvm/CodeGen/SchedGraphCommon.h" #include "llvm/CodeGen/MachineInstr.h" #include "llvm/Transforms/Scalar.h" -#include "Support/hash_map" -#include "Support/GraphTraits.h" +#include "llvm/ADT/hash_map" +#include "llvm/ADT/GraphTraits.h" namespace llvm { diff --git a/lib/Target/SparcV9/InstrSched/SchedGraphCommon.cpp b/lib/Target/SparcV9/InstrSched/SchedGraphCommon.cpp index da4492f359..0ad5f5844e 100644 --- a/lib/Target/SparcV9/InstrSched/SchedGraphCommon.cpp +++ b/lib/Target/SparcV9/InstrSched/SchedGraphCommon.cpp @@ -13,7 +13,7 @@ //===----------------------------------------------------------------------===// #include "llvm/CodeGen/SchedGraphCommon.h" -#include "Support/STLExtras.h" +#include "llvm/ADT/STLExtras.h" #include <iostream> namespace llvm { diff --git a/lib/Target/SparcV9/InstrSched/SchedPriorities.cpp b/lib/Target/SparcV9/InstrSched/SchedPriorities.cpp index 3c0e0b2c33..0aaece228d 100644 --- a/lib/Target/SparcV9/InstrSched/SchedPriorities.cpp +++ b/lib/Target/SparcV9/InstrSched/SchedPriorities.cpp @@ -21,7 +21,7 @@ #include "../../Target/SparcV9/LiveVar/FunctionLiveVarInfo.h" #include "llvm/CodeGen/MachineBasicBlock.h" #include "llvm/Support/CFG.h" -#include "Support/PostOrderIterator.h" +#include "llvm/ADT/PostOrderIterator.h" #include <iostream> namespace llvm { diff --git a/lib/Target/SparcV9/InstrSched/SchedPriorities.h b/lib/Target/SparcV9/InstrSched/SchedPriorities.h index 7470467806..dd807f788e 100644 --- a/lib/Target/SparcV9/InstrSched/SchedPriorities.h +++ b/lib/Target/SparcV9/InstrSched/SchedPriorities.h @@ -23,7 +23,7 @@ #include "SchedGraph.h" #include "llvm/CodeGen/InstrScheduling.h" #include "llvm/Target/TargetSchedInfo.h" -#include "Support/hash_set" +#include "llvm/ADT/hash_set" #include <list> namespace llvm { diff --git a/lib/Target/SparcV9/LiveVar/BBLiveVar.cpp b/lib/Target/SparcV9/LiveVar/BBLiveVar.cpp index 09f5954269..785054c9f2 100644 --- a/lib/Target/SparcV9/LiveVar/BBLiveVar.cpp +++ b/lib/Target/SparcV9/LiveVar/BBLiveVar.cpp @@ -16,7 +16,7 @@ #include "llvm/CodeGen/MachineInstr.h" #include "llvm/CodeGen/MachineBasicBlock.h" #include "llvm/Support/CFG.h" -#include "Support/SetOperations.h" +#include "llvm/ADT/SetOperations.h" #include "../SparcV9Internals.h" #include <iostream> diff --git a/lib/Target/SparcV9/LiveVar/BBLiveVar.h b/lib/Target/SparcV9/LiveVar/BBLiveVar.h index 7e5c72e3e4..e8486acf07 100644 --- a/lib/Target/SparcV9/LiveVar/BBLiveVar.h +++ b/lib/Target/SparcV9/LiveVar/BBLiveVar.h @@ -16,7 +16,7 @@ #define LIVE_VAR_BB_H #include "llvm/CodeGen/ValueSet.h" -#include "Support/hash_map" +#include "llvm/ADT/hash_map" namespace llvm { diff --git a/lib/Target/SparcV9/LiveVar/FunctionLiveVarInfo.cpp b/lib/Target/SparcV9/LiveVar/FunctionLiveVarInfo.cpp index 4a8ada9123..2883bf1c09 100644 --- a/lib/Target/SparcV9/LiveVar/FunctionLiveVarInfo.cpp +++ b/lib/Target/SparcV9/LiveVar/FunctionLiveVarInfo.cpp @@ -18,9 +18,9 @@ #include "llvm/Target/TargetMachine.h" #include "llvm/Target/TargetInstrInfo.h" #include "llvm/Support/CFG.h" -#include "Support/PostOrderIterator.h" -#include "Support/SetOperations.h" -#include "Support/CommandLine.h" +#include "llvm/ADT/PostOrderIterator.h" +#include "llvm/ADT/SetOperations.h" +#include "llvm/Support/CommandLine.h" #include "BBLiveVar.h" #include <iostream> diff --git a/lib/Target/SparcV9/LiveVar/FunctionLiveVarInfo.h b/lib/Target/SparcV9/LiveVar/FunctionLiveVarInfo.h index 23a9d93a6e..02d5c0531b 100644 --- a/lib/Target/SparcV9/LiveVar/FunctionLiveVarInfo.h +++ b/lib/Target/SparcV9/LiveVar/FunctionLiveVarInfo.h @@ -35,7 +35,7 @@ #ifndef FUNCTION_LIVE_VAR_INFO_H #define FUNCTION_LIVE_VAR_INFO_H -#include "Support/hash_map" +#include "llvm/ADT/hash_map" #include "llvm/Pass.h" #include "llvm/CodeGen/ValueSet.h" diff --git a/lib/Target/SparcV9/MachineFunctionInfo.h b/lib/Target/SparcV9/MachineFunctionInfo.h index 70bbccded5..3596bc2fa1 100644 --- a/lib/Target/SparcV9/MachineFunctionInfo.h +++ b/lib/Target/SparcV9/MachineFunctionInfo.h @@ -20,8 +20,8 @@ #include "MachineCodeForInstruction.h" #include "llvm/CodeGen/MachineFunction.h" -#include "Support/HashExtras.h" -#include "Support/hash_set" +#include "llvm/ADT/HashExtras.h" +#include "llvm/ADT/hash_set" namespace llvm { diff --git a/lib/Target/SparcV9/MappingInfo.cpp b/lib/Target/SparcV9/MappingInfo.cpp index e8c7581ed7..1a7212c9c0 100644 --- a/lib/Target/SparcV9/MappingInfo.cpp +++ b/lib/Target/SparcV9/MappingInfo.cpp @@ -47,7 +47,7 @@ #include "llvm/Module.h" #include "llvm/CodeGen/MachineFunction.h" #include "MachineCodeForInstruction.h" -#include "Support/StringExtras.h" +#include "llvm/ADT/StringExtras.h" namespace llvm { diff --git a/lib/Target/SparcV9/ModuloScheduling/MSSchedule.cpp b/lib/Target/SparcV9/ModuloScheduling/MSSchedule.cpp index c57cb5a3bd..b8bbccf8be 100644 --- a/lib/Target/SparcV9/ModuloScheduling/MSSchedule.cpp +++ b/lib/Target/SparcV9/ModuloScheduling/MSSchedule.cpp @@ -13,7 +13,7 @@ #define DEBUG_TYPE "ModuloSched" #include "MSSchedule.h" -#include "Support/Debug.h" +#include "llvm/Support/Debug.h" #include "llvm/Target/TargetSchedInfo.h" using namespace llvm; diff --git a/lib/Target/SparcV9/ModuloScheduling/MSchedGraph.cpp b/lib/Target/SparcV9/ModuloScheduling/MSchedGraph.cpp index 6bee44d934..5bdcc9afcf 100644 --- a/lib/Target/SparcV9/ModuloScheduling/MSchedGraph.cpp +++ b/lib/Target/SparcV9/ModuloScheduling/MSchedGraph.cpp @@ -16,7 +16,7 @@ #include "../../Target/SparcV9/SparcV9RegisterInfo.h" #include "llvm/CodeGen/MachineBasicBlock.h" #include "llvm/Target/TargetInstrInfo.h" -#include "Support/Debug.h" +#include "llvm/Support/Debug.h" #include <cstdlib> using namespace llvm; diff --git a/lib/Target/SparcV9/ModuloScheduling/MSchedGraph.h b/lib/Target/SparcV9/ModuloScheduling/MSchedGraph.h index 0dcbb496f1..4ea572a380 100644 --- a/lib/Target/SparcV9/ModuloScheduling/MSchedGraph.h +++ b/lib/Target/SparcV9/ModuloScheduling/MSchedGraph.h @@ -16,9 +16,9 @@ #include "llvm/CodeGen/MachineInstr.h" #include "llvm/Target/TargetMachine.h" -#include "Support/GraphTraits.h" -#include "Support/STLExtras.h" -#include "Support/iterator" +#include "llvm/ADT/GraphTraits.h" +#include "llvm/ADT/STLExtras.h" +#include "llvm/ADT/iterator" #include <vector> namespace llvm { diff --git a/lib/Target/SparcV9/ModuloScheduling/ModuloScheduling.cpp b/lib/Target/SparcV9/ModuloScheduling/ModuloScheduling.cpp index dadc38570c..9ad1e4ce4b 100644 --- a/lib/Target/SparcV9/ModuloScheduling/ModuloScheduling.cpp +++ b/lib/Target/SparcV9/ModuloScheduling/ModuloScheduling.cpp @@ -21,9 +21,9 @@ #include "llvm/CodeGen/Passes.h" #include "llvm/Support/CFG.h" #include "llvm/Target/TargetSchedInfo.h" -#include "Support/Debug.h" -#include "Support/GraphWriter.h" -#include "Support/StringExtras.h" +#include "llvm/Support/Debug.h" +#include "llvm/Support/GraphWriter.h" +#include "llvm/ADT/StringExtras.h" #include <cmath> #include <fstream> #include <sstream> diff --git a/lib/Target/SparcV9/RegAlloc/InterferenceGraph.cpp b/lib/Target/SparcV9/RegAlloc/InterferenceGraph.cpp index 9344e63f69..3f57eccd89 100644 --- a/lib/Target/SparcV9/RegAlloc/InterferenceGraph.cpp +++ b/lib/Target/SparcV9/RegAlloc/InterferenceGraph.cpp @@ -14,7 +14,7 @@ #include "IGNode.h" #include "InterferenceGraph.h" #include "RegAllocCommon.h" -#include "Support/STLExtras.h" +#include "llvm/ADT/STLExtras.h" #include <algorithm> #include <iostream> diff --git a/lib/Target/SparcV9/RegAlloc/LiveRange.h b/lib/Target/SparcV9/RegAlloc/LiveRange.h index 7a37596af0..503eddac7f 100644 --- a/lib/Target/SparcV9/RegAlloc/LiveRange.h +++ b/lib/Target/SparcV9/RegAlloc/LiveRange.h @@ -16,7 +16,7 @@ #define LIVERANGE_H #include "llvm/Value.h" -#include "Support/SetVector.h" +#include "llvm/ADT/SetVector.h" #include <iostream> namespace llvm { diff --git a/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.cpp b/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.cpp index b2b49d5465..190e0c57af 100644 --- a/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.cpp +++ b/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.cpp @@ -21,7 +21,7 @@ #include "llvm/Target/TargetMachine.h" #include "llvm/Target/TargetInstrInfo.h" #include "../SparcV9RegInfo.h" -#include "Support/SetOperations.h" +#include "llvm/ADT/SetOperations.h" #include <iostream> namespace llvm { diff --git a/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.h b/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.h index 89a169ea93..a656914605 100644 --- a/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.h +++ b/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.h @@ -27,7 +27,7 @@ #define LIVERANGEINFO_H #include "llvm/CodeGen/ValueSet.h" -#include "Support/hash_map" +#include "llvm/ADT/hash_map" namespace llvm { diff --git a/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp b/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp index bbbaee8822..6a1710ef54 100644 --- a/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp +++ b/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp @@ -43,9 +43,9 @@ #include "llvm/CodeGen/Passes.h" #include "llvm/Support/InstIterator.h" #include "llvm/Target/TargetInstrInfo.h" -#include "Support/CommandLine.h" -#include "Support/SetOperations.h" -#include "Support/STLExtras.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/ADT/SetOperations.h" +#include "llvm/ADT/STLExtras.h" #include <cmath> #include <iostream> diff --git a/lib/Target/SparcV9/SparcV9AsmPrinter.cpp b/lib/Target/SparcV9/SparcV9AsmPrinter.cpp index 36deae09d8..dbfc1e1e0c 100644 --- a/lib/Target/SparcV9/SparcV9AsmPrinter.cpp +++ b/lib/Target/SparcV9/SparcV9AsmPrinter.cpp @@ -28,8 +28,8 @@ #include "llvm/CodeGen/MachineFunction.h" #include "llvm/CodeGen/MachineInstr.h" #include "llvm/Support/Mangler.h" -#include "Support/StringExtras.h" -#include "Support/Statistic.h" +#include "llvm/ADT/StringExtras.h" +#include "llvm/ADT/Statistic.h" #include "SparcV9Internals.h" #include "MachineFunctionInfo.h" #include <string> diff --git a/lib/Target/SparcV9/SparcV9BurgISel.cpp b/lib/Target/SparcV9/SparcV9BurgISel.cpp index 0b4685c3a4..1d4dbbd2bf 100644 --- a/lib/Target/SparcV9/SparcV9BurgISel.cpp +++ b/lib/Target/SparcV9/SparcV9BurgISel.cpp @@ -37,12 +37,12 @@ #include "llvm/Target/TargetInstrInfo.h" #include "llvm/Target/TargetMachine.h" #include "llvm/Type.h" -#include "Config/alloca.h" -#include "Support/CommandLine.h" -#include "Support/LeakDetector.h" -#include "Support/MathExtras.h" -#include "Support/STLExtras.h" -#include "Support/hash_map" +#include "llvm/Config/alloca.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/LeakDetector.h" +#include "llvm/Support/MathExtras.h" +#include "llvm/ADT/STLExtras.h" +#include "llvm/ADT/hash_map" #include <algorithm> #include <cmath> #include <iostream> diff --git a/lib/Target/SparcV9/SparcV9CodeEmitter.cpp b/lib/Target/SparcV9/SparcV9CodeEmitter.cpp index e870a15e86..b46d07eb7b 100644 --- a/lib/Target/SparcV9/SparcV9CodeEmitter.cpp +++ b/lib/Target/SparcV9/SparcV9CodeEmitter.cpp @@ -30,15 +30,15 @@ #include "llvm/CodeGen/MachineInstr.h" #include "llvm/Target/TargetMachine.h" #include "llvm/Target/TargetData.h" -#include "Support/Debug.h" -#include "Support/hash_set" -#include "Support/Statistic.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/hash_set" +#include "llvm/ADT/Statistic.h" #include "SparcV9Internals.h" #include "SparcV9TargetMachine.h" #include "SparcV9RegInfo.h" #include "SparcV9CodeEmitter.h" #include "MachineFunctionInfo.h" -#include "Config/alloca.h" +#include "llvm/Config/alloca.h" namespace llvm { diff --git a/lib/Target/SparcV9/SparcV9Internals.h b/lib/Target/SparcV9/SparcV9Internals.h index 3ac696401f..187d984a47 100644 --- a/lib/Target/SparcV9/SparcV9Internals.h +++ b/lib/Target/SparcV9/SparcV9Internals.h @@ -22,7 +22,7 @@ #include "SparcV9RegInfo.h" #include "llvm/Type.h" #include "SparcV9RegClassInfo.h" -#include "Config/sys/types.h" +#include "llvm/Config/sys/types.h" namespace llvm { diff --git a/lib/Target/SparcV9/SparcV9PeepholeOpts.cpp b/lib/Target/SparcV9/SparcV9PeepholeOpts.cpp index 0b7baabb8d..778ced2532 100644 --- a/lib/Target/SparcV9/SparcV9PeepholeOpts.cpp +++ b/lib/Target/SparcV9/SparcV9PeepholeOpts.cpp @@ -19,7 +19,7 @@ #include "llvm/CodeGen/MachineInstr.h" #include "llvm/Target/TargetInstrInfo.h" #include "llvm/Target/TargetMachine.h" -#include "Support/STLExtras.h" +#include "llvm/ADT/STLExtras.h" namespace llvm { diff --git a/lib/Target/SparcV9/SparcV9RegInfo.h b/lib/Target/SparcV9/SparcV9RegInfo.h index 6f0ef04ae3..25a09616d0 100644 --- a/lib/Target/SparcV9/SparcV9RegInfo.h +++ b/lib/Target/SparcV9/SparcV9RegInfo.h @@ -15,7 +15,7 @@ #ifndef SPARCV9REGINFO_H #define SPARCV9REGINFO_H -#include "Support/hash_map" +#include "llvm/ADT/hash_map" #include <string> #include <cassert> diff --git a/lib/Target/SparcV9/SparcV9TargetMachine.cpp b/lib/Target/SparcV9/SparcV9TargetMachine.cpp index 29a208c68c..1019c5619f 100644 --- a/lib/Target/SparcV9/SparcV9TargetMachine.cpp +++ b/lib/Target/SparcV9/SparcV9TargetMachine.cpp @@ -29,7 +29,7 @@ #include "SparcV9Internals.h" #include "SparcV9TargetMachine.h" #include "SparcV9BurgISel.h" -#include "Support/CommandLine.h" +#include "llvm/Support/CommandLine.h" using namespace llvm; static const unsigned ImplicitRegUseList[] = { 0 }; /* not used yet */ diff --git a/lib/Target/SparcV9/SparcV9TmpInstr.cpp b/lib/Target/SparcV9/SparcV9TmpInstr.cpp index 605cf06189..6e53cbc3c3 100644 --- a/lib/Target/SparcV9/SparcV9TmpInstr.cpp +++ b/lib/Target/SparcV9/SparcV9TmpInstr.cpp @@ -13,7 +13,7 @@ //===----------------------------------------------------------------------===// #include "SparcV9TmpInstr.h" -#include "Support/LeakDetector.h" +#include "llvm/Support/LeakDetector.h" namespace llvm { diff --git a/lib/Target/TargetData.cpp b/lib/Target/TargetData.cpp index 22dde60d8f..a57d6ba2fb 100644 --- a/lib/Target/TargetData.cpp +++ b/lib/Target/TargetData.cpp @@ -21,7 +21,7 @@ #include "llvm/DerivedTypes.h" #include "llvm/Constants.h" #include "llvm/Support/GetElementPtrTypeIterator.h" -#include "Support/MathExtras.h" +#include "llvm/Support/MathExtras.h" using namespace llvm; // Handle the Pass registration stuff necessary to use TargetData's. diff --git a/lib/Target/TargetMachine.cpp b/lib/Target/TargetMachine.cpp index ee8ef2e5ed..973165f186 100644 --- a/lib/Target/TargetMachine.cpp +++ b/lib/Target/TargetMachine.cpp @@ -14,7 +14,7 @@ #include "llvm/Target/TargetMachine.h" #include "llvm/Type.h" #include "llvm/CodeGen/IntrinsicLowering.h" -#include "Support/CommandLine.h" +#include "llvm/Support/CommandLine.h" using namespace llvm; //--------------------------------------------------------------------------- diff --git a/lib/Target/X86/X86AsmPrinter.cpp b/lib/Target/X86/X86AsmPrinter.cpp index a0f046b62f..915ac3afd2 100644 --- a/lib/Target/X86/X86AsmPrinter.cpp +++ b/lib/Target/X86/X86AsmPrinter.cpp @@ -29,9 +29,9 @@ #include "llvm/CodeGen/ValueTypes.h" #include "llvm/Target/TargetMachine.h" #include "llvm/Support/Mangler.h" -#include "Support/Statistic.h" -#include "Support/StringExtras.h" -#include "Support/CommandLine.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/StringExtras.h" +#include "llvm/Support/CommandLine.h" using namespace llvm; namespace { diff --git a/lib/Target/X86/X86CodeEmitter.cpp b/lib/Target/X86/X86CodeEmitter.cpp index 98e3bb4912..69ab9ca928 100644 --- a/lib/Target/X86/X86CodeEmitter.cpp +++ b/lib/Target/X86/X86CodeEmitter.cpp @@ -21,9 +21,9 @@ #include "llvm/CodeGen/MachineInstr.h" #include "llvm/CodeGen/Passes.h" #include "llvm/Function.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" -#include "Config/alloca.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/Config/alloca.h" using namespace llvm; namespace { diff --git a/lib/Target/X86/X86FloatingPoint.cpp b/lib/Target/X86/X86FloatingPoint.cpp index 8d7a8e72cc..30763f0b98 100644 --- a/lib/Target/X86/X86FloatingPoint.cpp +++ b/lib/Target/X86/X86FloatingPoint.cpp @@ -37,10 +37,10 @@ #include "llvm/CodeGen/Passes.h" #include "llvm/Target/TargetInstrInfo.h" #include "llvm/Target/TargetMachine.h" -#include "Support/Debug.h" -#include "Support/DepthFirstIterator.h" -#include "Support/Statistic.h" -#include "Support/STLExtras.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/DepthFirstIterator.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/STLExtras.h" #include <algorithm> #include <set> using namespace llvm; diff --git a/lib/Target/X86/X86ISelSimple.cpp b/lib/Target/X86/X86ISelSimple.cpp index 19c61080db..e9dbc4b314 100644 --- a/lib/Target/X86/X86ISelSimple.cpp +++ b/lib/Target/X86/X86ISelSimple.cpp @@ -28,7 +28,7 @@ #include "llvm/Target/TargetMachine.h" #include "llvm/Support/GetElementPtrTypeIterator.h" #include "llvm/Support/InstVisitor.h" -#include "Support/Statistic.h" +#include "llvm/ADT/Statistic.h" using namespace llvm; namespace { diff --git a/lib/Target/X86/X86PeepholeOpt.cpp b/lib/Target/X86/X86PeepholeOpt.cpp index 82c622bff1..f03e339d2a 100644 --- a/lib/Target/X86/X86PeepholeOpt.cpp +++ b/lib/Target/X86/X86PeepholeOpt.cpp @@ -17,8 +17,8 @@ #include "llvm/Target/MRegisterInfo.h" #include "llvm/Target/TargetInstrInfo.h" #include "llvm/Target/TargetMachine.h" -#include "Support/Statistic.h" -#include "Support/STLExtras.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/STLExtras.h" using namespace llvm; diff --git a/lib/Target/X86/X86RegisterInfo.cpp b/lib/Target/X86/X86RegisterInfo.cpp index bac6138f03..d78110eb8f 100644 --- a/lib/Target/X86/X86RegisterInfo.cpp +++ b/lib/Target/X86/X86RegisterInfo.cpp @@ -24,8 +24,8 @@ #include "llvm/Target/TargetFrameInfo.h" #include "llvm/Target/TargetMachine.h" #include "llvm/Target/TargetOptions.h" -#include "Support/CommandLine.h" -#include "Support/STLExtras.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/ADT/STLExtras.h" #include <iostream> using namespace llvm; diff --git a/lib/Target/X86/X86TargetMachine.cpp b/lib/Target/X86/X86TargetMachine.cpp index 1a9e978dc4..06cbc49abf 100644 --- a/lib/Target/X86/X86TargetMachine.cpp +++ b/lib/Target/X86/X86TargetMachine.cpp @@ -21,8 +21,8 @@ #include "llvm/Target/TargetOptions.h" #include "llvm/Target/TargetMachineRegistry.h" #include "llvm/Transforms/Scalar.h" -#include "Support/CommandLine.h" -#include "Support/Statistic.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/ADT/Statistic.h" using namespace llvm; X86VectorEnum llvm::X86Vector = NoSSE; diff --git a/lib/Transforms/ExprTypeConvert.cpp b/lib/Transforms/ExprTypeConvert.cpp index a657f023df..779e23c199 100644 --- a/lib/Transforms/ExprTypeConvert.cpp +++ b/lib/Transforms/ExprTypeConvert.cpp @@ -17,8 +17,8 @@ #include "llvm/Constants.h" #include "llvm/Instructions.h" #include "llvm/Analysis/Expressions.h" -#include "Support/STLExtras.h" -#include "Support/Debug.h" +#include "llvm/ADT/STLExtras.h" +#include "llvm/Support/Debug.h" #include <algorithm> using namespace llvm; diff --git a/lib/Transforms/IPO/ArgumentPromotion.cpp b/lib/Transforms/IPO/ArgumentPromotion.cpp index fe945c408d..a4086524e1 100644 --- a/lib/Transforms/IPO/ArgumentPromotion.cpp +++ b/lib/Transforms/IPO/ArgumentPromotion.cpp @@ -39,10 +39,10 @@ #include "llvm/Target/TargetData.h" #include "llvm/Support/CallSite.h" #include "llvm/Support/CFG.h" -#include "Support/Debug.h" -#include "Support/DepthFirstIterator.h" -#include "Support/Statistic.h" -#include "Support/StringExtras.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/DepthFirstIterator.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/StringExtras.h" #include <set> using namespace llvm; diff --git a/lib/Transforms/IPO/ConstantMerge.cpp b/lib/Transforms/IPO/ConstantMerge.cpp index 417cb1de4b..9f3c10959c 100644 --- a/lib/Transforms/IPO/ConstantMerge.cpp +++ b/lib/Transforms/IPO/ConstantMerge.cpp @@ -20,7 +20,7 @@ #include "llvm/Transforms/IPO.h" #include "llvm/Module.h" #include "llvm/Pass.h" -#include "Support/Statistic.h" +#include "llvm/ADT/Statistic.h" using namespace llvm; namespace { diff --git a/lib/Transforms/IPO/DeadArgumentElimination.cpp b/lib/Transforms/IPO/DeadArgumentElimination.cpp index 836e0b6091..cde186c38d 100644 --- a/lib/Transforms/IPO/DeadArgumentElimination.cpp +++ b/lib/Transforms/IPO/DeadArgumentElimination.cpp @@ -24,9 +24,9 @@ #include "llvm/Constant.h" #include "llvm/Instructions.h" #include "llvm/Support/CallSite.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" -#include "Support/iterator" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/iterator" #include <set> using namespace llvm; diff --git a/lib/Transforms/IPO/DeadTypeElimination.cpp b/lib/Transforms/IPO/DeadTypeElimination.cpp index cad90f5672..e2d475daf9 100644 --- a/lib/Transforms/IPO/DeadTypeElimination.cpp +++ b/lib/Transforms/IPO/DeadTypeElimination.cpp @@ -17,7 +17,7 @@ #include "llvm/Module.h" #include "llvm/SymbolTable.h" #include "llvm/DerivedTypes.h" -#include "Support/Statistic.h" +#include "llvm/ADT/Statistic.h" using namespace llvm; namespace { diff --git a/lib/Transforms/IPO/FunctionResolution.cpp b/lib/Transforms/IPO/FunctionResolution.cpp index 8403226ba3..006d33cf51 100644 --- a/lib/Transforms/IPO/FunctionResolution.cpp +++ b/lib/Transforms/IPO/FunctionResolution.cpp @@ -27,7 +27,7 @@ #include "llvm/Support/CallSite.h" #include "llvm/Target/TargetData.h" #include "llvm/Assembly/Writer.h" -#include "Support/Statistic.h" +#include "llvm/ADT/Statistic.h" #include <algorithm> using namespace llvm; diff --git a/lib/Transforms/IPO/GlobalDCE.cpp b/lib/Transforms/IPO/GlobalDCE.cpp index e025813fd0..ea5201cd23 100644 --- a/lib/Transforms/IPO/GlobalDCE.cpp +++ b/lib/Transforms/IPO/GlobalDCE.cpp @@ -19,7 +19,7 @@ #include "llvm/Constants.h" #include "llvm/Module.h" #include "llvm/Pass.h" -#include "Support/Statistic.h" +#include "llvm/ADT/Statistic.h" #include <set> using namespace llvm; diff --git a/lib/Transforms/IPO/GlobalOpt.cpp b/lib/Transforms/IPO/GlobalOpt.cpp index f9be0ad246..dd9894cd19 100644 --- a/lib/Transforms/IPO/GlobalOpt.cpp +++ b/lib/Transforms/IPO/GlobalOpt.cpp @@ -23,8 +23,8 @@ #include "llvm/Instructions.h" #include "llvm/Module.h" #include "llvm/Pass.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" #include <set> using namespace llvm; diff --git a/lib/Transforms/IPO/IPConstantPropagation.cpp b/lib/Transforms/IPO/IPConstantPropagation.cpp index 36ac2023c1..74a0a9b699 100644 --- a/lib/Transforms/IPO/IPConstantPropagation.cpp +++ b/lib/Transforms/IPO/IPConstantPropagation.cpp @@ -20,7 +20,7 @@ #include "llvm/Pass.h" #include "llvm/Constants.h" #include "llvm/Support/CallSite.h" -#include "Support/Statistic.h" +#include "llvm/ADT/Statistic.h" using namespace llvm; namespace { diff --git a/lib/Transforms/IPO/Inliner.cpp b/lib/Transforms/IPO/Inliner.cpp index f0cb03d7b1..86d343af6a 100644 --- a/lib/Transforms/IPO/Inliner.cpp +++ b/lib/Transforms/IPO/Inliner.cpp @@ -19,9 +19,9 @@ #include "llvm/Analysis/CallGraph.h" #include "llvm/Support/CallSite.h" #include "llvm/Transforms/Utils/Cloning.h" -#include "Support/CommandLine.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" #include <set> using namespace llvm; diff --git a/lib/Transforms/IPO/Internalize.cpp b/lib/Transforms/IPO/Internalize.cpp index 15c68cd893..c6b75b1be9 100644 --- a/lib/Transforms/IPO/Internalize.cpp +++ b/lib/Transforms/IPO/Internalize.cpp @@ -16,9 +16,9 @@ #include "llvm/Transforms/IPO.h" #include "llvm/Pass.h" #include "llvm/Module.h" -#include "Support/CommandLine.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" #include <fstream> #include <set> using namespace llvm; diff --git a/lib/Transforms/IPO/LoopExtractor.cpp b/lib/Transforms/IPO/LoopExtractor.cpp index a36c99632e..e1ce290526 100644 --- a/lib/Transforms/IPO/LoopExtractor.cpp +++ b/lib/Transforms/IPO/LoopExtractor.cpp @@ -22,7 +22,7 @@ #include "llvm/Analysis/LoopInfo.h" #include "llvm/Transforms/Scalar.h" #include "llvm/Transforms/Utils/FunctionUtils.h" -#include "Support/Statistic.h" +#include "llvm/ADT/Statistic.h" using namespace llvm; namespace { diff --git a/lib/Transforms/IPO/LowerSetJmp.cpp b/lib/Transforms/IPO/LowerSetJmp.cpp index f5c36d99ae..ebd0500cba 100644 --- a/lib/Transforms/IPO/LowerSetJmp.cpp +++ b/lib/Transforms/IPO/LowerSetJmp.cpp @@ -43,10 +43,10 @@ #include "llvm/Support/CFG.h" #include "llvm/Support/InstVisitor.h" #include "llvm/Transforms/Utils/Local.h" -#include "Support/DepthFirstIterator.h" -#include "Support/Statistic.h" -#include "Support/StringExtras.h" -#include "Support/VectorExtras.h" +#include "llvm/ADT/DepthFirstIterator.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/StringExtras.h" +#include "llvm/ADT/VectorExtras.h" using namespace llvm; namespace { diff --git a/lib/Transforms/IPO/PruneEH.cpp b/lib/Transforms/IPO/PruneEH.cpp index fbb1659488..43b9acff73 100644 --- a/lib/Transforms/IPO/PruneEH.cpp +++ b/lib/Transforms/IPO/PruneEH.cpp @@ -20,7 +20,7 @@ #include "llvm/Intrinsics.h" #include "llvm/Instructions.h" #include "llvm/Analysis/CallGraph.h" -#include "Support/Statistic.h" +#include "llvm/ADT/Statistic.h" #include <set> using namespace llvm; diff --git a/lib/Transforms/IPO/RaiseAllocations.cpp b/lib/Transforms/IPO/RaiseAllocations.cpp index 36aef9c8eb..42edb7e05d 100644 --- a/lib/Transforms/IPO/RaiseAllocations.cpp +++ b/lib/Transforms/IPO/RaiseAllocations.cpp @@ -19,7 +19,7 @@ #include "llvm/Instructions.h" #include "llvm/Pass.h" #include "llvm/Support/CallSite.h" -#include "Support/Statistic.h" +#include "llvm/ADT/Statistic.h" using namespace llvm; namespace { diff --git a/lib/Transforms/Instrumentation/ProfilePaths/Graph.cpp b/lib/Transforms/Instrumentation/ProfilePaths/Graph.cpp index c60636cfb5..28830afba8 100644 --- a/lib/Transforms/Instrumentation/ProfilePaths/Graph.cpp +++ b/lib/Transforms/Instrumentation/ProfilePaths/Graph.cpp @@ -14,7 +14,7 @@ #include "Graph.h" #include "llvm/Instructions.h" -#include "Support/Debug.h" +#include "llvm/Support/Debug.h" #include <algorithm> using std::vector; diff --git a/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxiliary.cpp b/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxiliary.cpp index 4e8419d965..10ef440b4f 100644 --- a/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxiliary.cpp +++ b/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxiliary.cpp @@ -15,7 +15,7 @@ #include "llvm/Pass.h" #include "llvm/Module.h" #include "llvm/Instructions.h" -#include "Support/Debug.h" +#include "llvm/Support/Debug.h" #include <algorithm> #include "Graph.h" diff --git a/lib/Transforms/Instrumentation/ProfilePaths/InstLoops.cpp b/lib/Transforms/Instrumentation/ProfilePaths/InstLoops.cpp index 96d23f2253..56a20730b7 100644 --- a/lib/Transforms/Instrumentation/ProfilePaths/InstLoops.cpp +++ b/lib/Transforms/Instrumentation/ProfilePaths/InstLoops.cpp @@ -20,7 +20,7 @@ #include "llvm/Module.h" #include "llvm/Pass.h" #include "llvm/Type.h" -#include "Support/Debug.h" +#include "llvm/Support/Debug.h" #include "../ProfilingUtils.h" namespace llvm { diff --git a/lib/Transforms/Instrumentation/TraceBasicBlocks.cpp b/lib/Transforms/Instrumentation/TraceBasicBlocks.cpp index 3953c28e52..60426c4e5a 100644 --- a/lib/Transforms/Instrumentation/TraceBasicBlocks.cpp +++ b/lib/Transforms/Instrumentation/TraceBasicBlocks.cpp @@ -20,7 +20,7 @@ #include "llvm/Transforms/Utils/BasicBlockUtils.h" #include "llvm/Instructions.h" #include "ProfilingUtils.h" -#include "Support/Debug.h" +#include "llvm/Support/Debug.h" #include <set> using namespace llvm; diff --git a/lib/Transforms/Instrumentation/TraceValues.cpp b/lib/Transforms/Instrumentation/TraceValues.cpp index ae356a2f73..1247dfcfbb 100644 --- a/lib/Transforms/Instrumentation/TraceValues.cpp +++ b/lib/Transforms/Instrumentation/TraceValues.cpp @@ -19,8 +19,8 @@ #include "llvm/Module.h" #include "llvm/Pass.h" #include "llvm/Assembly/Writer.h" -#include "Support/CommandLine.h" -#include "Support/StringExtras.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/ADT/StringExtras.h" #include <algorithm> #include <sstream> using namespace llvm; diff --git a/lib/Transforms/LevelRaise.cpp b/lib/Transforms/LevelRaise.cpp index f470e50461..cc4e69d9ac 100644 --- a/lib/Transforms/LevelRaise.cpp +++ b/lib/Transforms/LevelRaise.cpp @@ -19,10 +19,10 @@ #include "llvm/Instructions.h" #include "llvm/Pass.h" #include "llvm/Transforms/Utils/BasicBlockUtils.h" -#include "Support/CommandLine.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" -#include "Support/STLExtras.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/STLExtras.h" #include <algorithm> using namespace llvm; diff --git a/lib/Transforms/Scalar/ADCE.cpp b/lib/Transforms/Scalar/ADCE.cpp index 04a6417272..5770bb692c 100644 --- a/lib/Transforms/Scalar/ADCE.cpp +++ b/lib/Transforms/Scalar/ADCE.cpp @@ -23,10 +23,10 @@ #include "llvm/Transforms/Utils/BasicBlockUtils.h" #include "llvm/Transforms/Utils/Local.h" #include "llvm/Transforms/Utils/UnifyFunctionExitNodes.h" -#include "Support/Debug.h" -#include "Support/DepthFirstIterator.h" -#include "Support/Statistic.h" -#include "Support/STLExtras.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/DepthFirstIterator.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/STLExtras.h" #include <algorithm> using namespace llvm; diff --git a/lib/Transforms/Scalar/BasicBlockPlacement.cpp b/lib/Transforms/Scalar/BasicBlockPlacement.cpp index a25ab0f121..cadc620170 100644 --- a/lib/Transforms/Scalar/BasicBlockPlacement.cpp +++ b/lib/Transforms/Scalar/BasicBlockPlacement.cpp @@ -30,7 +30,7 @@ #include "llvm/Function.h" #include "llvm/Pass.h" #include "llvm/Support/CFG.h" -#include "Support/Statistic.h" +#include "llvm/ADT/Statistic.h" #include <set> using namespace llvm; diff --git a/lib/Transforms/Scalar/ConstantProp.cpp b/lib/Transforms/Scalar/ConstantProp.cpp index 8be02476b9..2985ceba63 100644 --- a/lib/Transforms/Scalar/ConstantProp.cpp +++ b/lib/Transforms/Scalar/ConstantProp.cpp @@ -24,7 +24,7 @@ #include "llvm/Instruction.h" #include "llvm/Pass.h" #include "llvm/Support/InstIterator.h" -#include "Support/Statistic.h" +#include "llvm/ADT/Statistic.h" #include <set> using namespace llvm; diff --git a/lib/Transforms/Scalar/CorrelatedExprs.cpp b/lib/Transforms/Scalar/CorrelatedExprs.cpp index 9738879e28..53c56d2631 100644 --- a/lib/Transforms/Scalar/CorrelatedExprs.cpp +++ b/lib/Transforms/Scalar/CorrelatedExprs.cpp @@ -38,9 +38,9 @@ #include "llvm/Transforms/Utils/BasicBlockUtils.h" #include "llvm/Support/ConstantRange.h" #include "llvm/Support/CFG.h" -#include "Support/Debug.h" -#include "Support/PostOrderIterator.h" -#include "Support/Statistic.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/PostOrderIterator.h" +#include "llvm/ADT/Statistic.h" #include <algorithm> using namespace llvm; diff --git a/lib/Transforms/Scalar/DCE.cpp b/lib/Transforms/Scalar/DCE.cpp index 570a5252d5..1a523cde46 100644 --- a/lib/Transforms/Scalar/DCE.cpp +++ b/lib/Transforms/Scalar/DCE.cpp @@ -21,7 +21,7 @@ #include "llvm/Instruction.h" #include "llvm/Pass.h" #include "llvm/Support/InstIterator.h" -#include "Support/Statistic.h" +#include "llvm/ADT/Statistic.h" #include <set> using namespace llvm; diff --git a/lib/Transforms/Scalar/DeadStoreElimination.cpp b/lib/Transforms/Scalar/DeadStoreElimination.cpp index 40b5671e4c..82dfebb594 100644 --- a/lib/Transforms/Scalar/DeadStoreElimination.cpp +++ b/lib/Transforms/Scalar/DeadStoreElimination.cpp @@ -22,8 +22,8 @@ #include "llvm/Analysis/AliasSetTracker.h" #include "llvm/Target/TargetData.h" #include "llvm/Transforms/Utils/Local.h" -#include "Support/SetVector.h" -#include "Support/Statistic.h" +#include "llvm/ADT/SetVector.h" +#include "llvm/ADT/Statistic.h" using namespace llvm; namespace { diff --git a/lib/Transforms/Scalar/DecomposeMultiDimRefs.cpp b/lib/Transforms/Scalar/DecomposeMultiDimRefs.cpp index b1f8f2a01a..40e1be5d46 100644 --- a/lib/Transforms/Scalar/DecomposeMultiDimRefs.cpp +++ b/lib/Transforms/Scalar/DecomposeMultiDimRefs.cpp @@ -22,8 +22,8 @@ #include "llvm/Instructions.h" #include "llvm/BasicBlock.h" #include "llvm/Pass.h" -#include "Support/Statistic.h" -#include "Support/Debug.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/Support/Debug.h" using namespace llvm; namespace { diff --git a/lib/Transforms/Scalar/GCSE.cpp b/lib/Transforms/Scalar/GCSE.cpp index a3452a3f84..776ff6603a 100644 --- a/lib/Transforms/Scalar/GCSE.cpp +++ b/lib/Transforms/Scalar/GCSE.cpp @@ -22,8 +22,8 @@ #include "llvm/Analysis/Dominators.h" #include "llvm/Analysis/ValueNumbering.h" #include "llvm/Transforms/Utils/Local.h" -#include "Support/DepthFirstIterator.h" -#include "Support/Statistic.h" +#include "llvm/ADT/DepthFirstIterator.h" +#include "llvm/ADT/Statistic.h" #include <algorithm> using namespace llvm; diff --git a/lib/Transforms/Scalar/IndVarSimplify.cpp b/lib/Transforms/Scalar/IndVarSimplify.cpp index 7c1f1161f5..a269353487 100644 --- a/lib/Transforms/Scalar/IndVarSimplify.cpp +++ b/lib/Transforms/Scalar/IndVarSimplify.cpp @@ -46,8 +46,8 @@ #include "llvm/Analysis/LoopInfo.h" #include "llvm/Support/CFG.h" #include "llvm/Transforms/Utils/Local.h" -#include "Support/CommandLine.h" -#include "Support/Statistic.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/ADT/Statistic.h" using namespace llvm; namespace { diff --git a/lib/Transforms/Scalar/InstructionCombining.cpp b/lib/Transforms/Scalar/InstructionCombining.cpp index 97cdc1196e..2340c49b56 100644 --- a/lib/Transforms/Scalar/InstructionCombining.cpp +++ b/lib/Transforms/Scalar/InstructionCombining.cpp @@ -49,8 +49,8 @@ #include "llvm/Support/InstIterator.h" #include "llvm/Support/InstVisitor.h" #include "llvm/Support/PatternMatch.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" #include <algorithm> using namespace llvm; using namespace llvm::PatternMatch; diff --git a/lib/Transforms/Scalar/LICM.cpp b/lib/Transforms/Scalar/LICM.cpp index 792a672f04..9a104db00a 100644 --- a/lib/Transforms/Scalar/LICM.cpp +++ b/lib/Transforms/Scalar/LICM.cpp @@ -42,9 +42,9 @@ #include "llvm/Support/CFG.h" #include "llvm/Transforms/Utils/PromoteMemToReg.h" #include "llvm/Transforms/Utils/Local.h" -#include "Support/CommandLine.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" #include <algorithm> using namespace llvm; diff --git a/lib/Transforms/Scalar/LoopUnroll.cpp b/lib/Transforms/Scalar/LoopUnroll.cpp index a9cced5ce1..d24b94fac8 100644 --- a/lib/Transforms/Scalar/LoopUnroll.cpp +++ b/lib/Transforms/Scalar/LoopUnroll.cpp @@ -24,10 +24,10 @@ #include "llvm/Analysis/LoopInfo.h" #include "llvm/Transforms/Utils/Cloning.h" #include "llvm/Transforms/Utils/Local.h" -#include "Support/CommandLine.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" -#include "Support/STLExtras.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/STLExtras.h" #include <cstdio> #include <set> using namespace llvm; diff --git a/lib/Transforms/Scalar/LoopUnswitch.cpp b/lib/Transforms/Scalar/LoopUnswitch.cpp index 83dc1836d6..73a99c2212 100644 --- a/lib/Transforms/Scalar/LoopUnswitch.cpp +++ b/lib/Transforms/Scalar/LoopUnswitch.cpp @@ -35,8 +35,8 @@ #include "llvm/Analysis/LoopInfo.h" #include "llvm/Transforms/Utils/Cloning.h" #include "llvm/Transforms/Utils/Local.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" using namespace llvm; namespace { diff --git a/lib/Transforms/Scalar/LowerPacked.cpp b/lib/Transforms/Scalar/LowerPacked.cpp index 2d90ccb300..7a42bf7fba 100644 --- a/lib/Transforms/Scalar/LowerPacked.cpp +++ b/lib/Transforms/Scalar/LowerPacked.cpp @@ -19,7 +19,7 @@ #include "llvm/Instructions.h" #include "llvm/Pass.h" #include "llvm/Support/InstVisitor.h" -#include "Support/StringExtras.h" +#include "llvm/ADT/StringExtras.h" #include <algorithm> #include <map> #include <iostream> diff --git a/lib/Transforms/Scalar/PRE.cpp b/lib/Transforms/Scalar/PRE.cpp index 38c5595ebc..f8752336b2 100644 --- a/lib/Transforms/Scalar/PRE.cpp +++ b/lib/Transforms/Scalar/PRE.cpp @@ -29,11 +29,11 @@ #include "llvm/Analysis/PostDominators.h" #include "llvm/Analysis/ValueNumbering.h" #include "llvm/Transforms/Scalar.h" -#include "Support/Debug.h" -#include "Support/DepthFirstIterator.h" -#include "Support/PostOrderIterator.h" -#include "Support/Statistic.h" -#include "Support/hash_set" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/DepthFirstIterator.h" +#include "llvm/ADT/PostOrderIterator.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/hash_set" using namespace llvm; namespace { diff --git a/lib/Transforms/Scalar/PiNodeInsertion.cpp b/lib/Transforms/Scalar/PiNodeInsertion.cpp index 5227e7c612..202ca74040 100644 --- a/lib/Transforms/Scalar/PiNodeInsertion.cpp +++ b/lib/Transforms/Scalar/PiNodeInsertion.cpp @@ -38,7 +38,7 @@ #include "llvm/Function.h" #include "llvm/Instructions.h" #include "llvm/Support/CFG.h" -#include "Support/Statistic.h" +#include "llvm/ADT/Statistic.h" using namespace llvm; namespace { diff --git a/lib/Transforms/Scalar/Reassociate.cpp b/lib/Transforms/Scalar/Reassociate.cpp index 6f84344889..c74cf51ccc 100644 --- a/lib/Transforms/Scalar/Reassociate.cpp +++ b/lib/Transforms/Scalar/Reassociate.cpp @@ -30,9 +30,9 @@ #include "llvm/Pass.h" #include "llvm/Constant.h" #include "llvm/Support/CFG.h" -#include "Support/Debug.h" -#include "Support/PostOrderIterator.h" -#include "Support/Statistic.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/PostOrderIterator.h" +#include "llvm/ADT/Statistic.h" using namespace llvm; namespace { diff --git a/lib/Transforms/Scalar/SCCP.cpp b/lib/Transforms/Scalar/SCCP.cpp index 1c39160d9b..497bf0ae9b 100644 --- a/lib/Transforms/Scalar/SCCP.cpp +++ b/lib/Transforms/Scalar/SCCP.cpp @@ -30,10 +30,10 @@ #include "llvm/Type.h" #include "llvm/Support/InstVisitor.h" #include "llvm/Transforms/Utils/Local.h" -#include "Support/Debug.h" -#include "Support/hash_map" -#include "Support/Statistic.h" -#include "Support/STLExtras.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/hash_map" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/STLExtras.h" #include <algorithm> #include <set> using namespace llvm; diff --git a/lib/Transforms/Scalar/ScalarReplAggregates.cpp b/lib/Transforms/Scalar/ScalarReplAggregates.cpp index 32c9040c5b..a0d5afe0ce 100644 --- a/lib/Transforms/Scalar/ScalarReplAggregates.cpp +++ b/lib/Transforms/Scalar/ScalarReplAggregates.cpp @@ -29,9 +29,9 @@ #include "llvm/Support/GetElementPtrTypeIterator.h" #include "llvm/Target/TargetData.h" #include "llvm/Transforms/Utils/PromoteMemToReg.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" -#include "Support/StringExtras.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/StringExtras.h" using namespace llvm; namespace { diff --git a/lib/Transforms/Scalar/SimplifyCFG.cpp b/lib/Transforms/Scalar/SimplifyCFG.cpp index 8e0f7d3307..0f9946e6ee 100644 --- a/lib/Transforms/Scalar/SimplifyCFG.cpp +++ b/lib/Transforms/Scalar/SimplifyCFG.cpp @@ -23,7 +23,7 @@ #include "llvm/Module.h" #include "llvm/Support/CFG.h" #include "llvm/Pass.h" -#include "Support/Statistic.h" +#include "llvm/ADT/Statistic.h" #include <set> using namespace llvm; diff --git a/lib/Transforms/Scalar/TailDuplication.cpp b/lib/Transforms/Scalar/TailDuplication.cpp index 2a5a606282..717a845765 100644 --- a/lib/Transforms/Scalar/TailDuplication.cpp +++ b/lib/Transforms/Scalar/TailDuplication.cpp @@ -26,9 +26,9 @@ #include "llvm/Type.h" #include "llvm/Support/CFG.h" #include "llvm/Transforms/Utils/Local.h" -#include "Support/CommandLine.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" using namespace llvm; namespace { diff --git a/lib/Transforms/Scalar/TailRecursionElimination.cpp b/lib/Transforms/Scalar/TailRecursionElimination.cpp index 0ca5562bae..758628ca64 100644 --- a/lib/Transforms/Scalar/TailRecursionElimination.cpp +++ b/lib/Transforms/Scalar/TailRecursionElimination.cpp @@ -51,7 +51,7 @@ #include "llvm/Instructions.h" #include "llvm/Pass.h" #include "llvm/Support/CFG.h" -#include "Support/Statistic.h" +#include "llvm/ADT/Statistic.h" using namespace llvm; namespace { diff --git a/lib/Transforms/Utils/BreakCriticalEdges.cpp b/lib/Transforms/Utils/BreakCriticalEdges.cpp index f5df661334..4a5c9d904b 100644 --- a/lib/Transforms/Utils/BreakCriticalEdges.cpp +++ b/lib/Transforms/Utils/BreakCriticalEdges.cpp @@ -22,7 +22,7 @@ #include "llvm/Function.h" #include "llvm/Instructions.h" #include "llvm/Support/CFG.h" -#include "Support/Statistic.h" +#include "llvm/ADT/Statistic.h" using namespace llvm; namespace { diff --git a/lib/Transforms/Utils/CodeExtractor.cpp b/lib/Transforms/Utils/CodeExtractor.cpp index aabc587b56..5dd03bd9e7 100644 --- a/lib/Transforms/Utils/CodeExtractor.cpp +++ b/lib/Transforms/Utils/CodeExtractor.cpp @@ -24,9 +24,9 @@ #include "llvm/Analysis/LoopInfo.h" #include "llvm/Analysis/Verifier.h" #include "llvm/Transforms/Utils/BasicBlockUtils.h" -#include "Support/CommandLine.h" -#include "Support/Debug.h" -#include "Support/StringExtras.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/StringExtras.h" #include <algorithm> #include <set> using namespace llvm; diff --git a/lib/Transforms/Utils/Local.cpp b/lib/Transforms/Utils/Local.cpp index 41454ae0cb..fe27f308cf 100644 --- a/lib/Transforms/Utils/Local.cpp +++ b/lib/Transforms/Utils/Local.cpp @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -#include "Support/MathExtras.h" +#include "llvm/Support/MathExtras.h" #include "llvm/Transforms/Utils/Local.h" #include "llvm/Constants.h" #include "llvm/Instructions.h" diff --git a/lib/Transforms/Utils/LoopSimplify.cpp b/lib/Transforms/Utils/LoopSimplify.cpp index 2a4d88b99e..81cf8e2778 100644 --- a/lib/Transforms/Utils/LoopSimplify.cpp +++ b/lib/Transforms/Utils/LoopSimplify.cpp @@ -41,10 +41,10 @@ #include "llvm/Analysis/LoopInfo.h" #include "llvm/Support/CFG.h" #include "llvm/Transforms/Utils/Local.h" -#include "Support/SetOperations.h" -#include "Support/SetVector.h" -#include "Support/Statistic.h" -#include "Support/DepthFirstIterator.h" +#include "llvm/ADT/SetOperations.h" +#include "llvm/ADT/SetVector.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/DepthFirstIterator.h" using namespace llvm; namespace { diff --git a/lib/Transforms/Utils/LowerAllocations.cpp b/lib/Transforms/Utils/LowerAllocations.cpp index a5197a0e01..f3c1a79052 100644 --- a/lib/Transforms/Utils/LowerAllocations.cpp +++ b/lib/Transforms/Utils/LowerAllocations.cpp @@ -18,7 +18,7 @@ #include "llvm/Instructions.h" #include "llvm/Constants.h" #include "llvm/Pass.h" -#include "Support/Statistic.h" +#include "llvm/ADT/Statistic.h" using namespace llvm; namespace { diff --git a/lib/Transforms/Utils/LowerInvoke.cpp b/lib/Transforms/Utils/LowerInvoke.cpp index 835a5ae789..2c6cf7e91a 100644 --- a/lib/Transforms/Utils/LowerInvoke.cpp +++ b/lib/Transforms/Utils/LowerInvoke.cpp @@ -41,8 +41,8 @@ #include "llvm/Module.h" #include "llvm/Pass.h" #include "llvm/Transforms/Utils/BasicBlockUtils.h" -#include "Support/Statistic.h" -#include "Support/CommandLine.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/Support/CommandLine.h" #include <csetjmp> using namespace llvm; diff --git a/lib/Transforms/Utils/LowerSelect.cpp b/lib/Transforms/Utils/LowerSelect.cpp index 647658e3a5..f914e747a1 100644 --- a/lib/Transforms/Utils/LowerSelect.cpp +++ b/lib/Transforms/Utils/LowerSelect.cpp @@ -23,7 +23,7 @@ #include "llvm/Instructions.h" #include "llvm/Pass.h" #include "llvm/Type.h" -#include "Support/Statistic.h" +#include "llvm/ADT/Statistic.h" using namespace llvm; namespace { diff --git a/lib/Transforms/Utils/LowerSwitch.cpp b/lib/Transforms/Utils/LowerSwitch.cpp index 710188aa2b..24a2963c27 100644 --- a/lib/Transforms/Utils/LowerSwitch.cpp +++ b/lib/Transforms/Utils/LowerSwitch.cpp @@ -18,8 +18,8 @@ #include "llvm/Function.h" #include "llvm/Instructions.h" #include "llvm/Pass.h" -#include "Support/Debug.h" -#include "Support/Statistic.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" using namespace llvm; namespace { diff --git a/lib/Transforms/Utils/Mem2Reg.cpp b/lib/Transforms/Utils/Mem2Reg.cpp index 12dd582525..39400e72ad 100644 --- a/lib/Transforms/Utils/Mem2Reg.cpp +++ b/lib/Transforms/Utils/Mem2Reg.cpp @@ -18,7 +18,7 @@ #include "llvm/Instructions.h" #include "llvm/Function.h" #include "llvm/Target/TargetData.h" -#include "Support/Statistic.h" +#include "llvm/ADT/Statistic.h" using namespace llvm; namespace { diff --git a/lib/Transforms/Utils/PromoteMemoryToRegister.cpp b/lib/Transforms/Utils/PromoteMemoryToRegister.cpp index ced2315e0e..81f5cd3ed3 100644 --- a/lib/Transforms/Utils/PromoteMemoryToRegister.cpp +++ b/lib/Transforms/Utils/PromoteMemoryToRegister.cpp @@ -23,7 +23,7 @@ #include "llvm/Constant.h" #include "llvm/Support/CFG.h" #include "llvm/Support/StableBasicBlockNumbering.h" -#include "Support/StringExtras.h" +#include "llvm/ADT/StringExtras.h" using namespace llvm; /// isAllocaPromotable - Return true if this alloca is legal for promotion. diff --git a/lib/Transforms/Utils/SimplifyCFG.cpp b/lib/Transforms/Utils/SimplifyCFG.cpp index e2a5c8e365..c932173330 100644 --- a/lib/Transforms/Utils/SimplifyCFG.cpp +++ b/lib/Transforms/Utils/SimplifyCFG.cpp @@ -17,7 +17,7 @@ #include "llvm/Instructions.h" #include "llvm/Type.h" #include "llvm/Support/CFG.h" -#include "Support/Debug.h" +#include "llvm/Support/Debug.h" #include <algorithm> #include <functional> #include <set> diff --git a/lib/VMCore/AsmWriter.cpp b/lib/VMCore/AsmWriter.cpp index f70a82839a..0c4a1f7826 100644 --- a/lib/VMCore/AsmWriter.cpp +++ b/lib/VMCore/AsmWriter.cpp @@ -26,8 +26,8 @@ #include "llvm/SymbolTable.h" #include "llvm/Assembly/Writer.h" #include "llvm/Support/CFG.h" -#include "Support/StringExtras.h" -#include "Support/STLExtras.h" +#include "llvm/ADT/StringExtras.h" +#include "llvm/ADT/STLExtras.h" #include <algorithm> using namespace llvm; diff --git a/lib/VMCore/BasicBlock.cpp b/lib/VMCore/BasicBlock.cpp index 005740904d..32c86c4ce6 100644 --- a/lib/VMCore/BasicBlock.cpp +++ b/lib/VMCore/BasicBlock.cpp @@ -17,7 +17,7 @@ #include "llvm/Type.h" #include "llvm/Support/CFG.h" #include "llvm/SymbolTable.h" -#include "Support/LeakDetector.h" +#include "llvm/Support/LeakDetector.h" #include "SymbolTableListTraitsImpl.h" #include <algorithm> using namespace llvm; diff --git a/lib/VMCore/Constants.cpp b/lib/VMCore/Constants.cpp index 8b28c0d3ff..77c34296aa 100644 --- a/lib/VMCore/Constants.cpp +++ b/lib/VMCore/Constants.cpp @@ -18,7 +18,7 @@ #include "llvm/Instructions.h" #include "llvm/SymbolTable.h" #include "llvm/Module.h" -#include "Support/StringExtras.h" +#include "llvm/ADT/StringExtras.h" #include <algorithm> #include <iostream> using namespace llvm; diff --git a/lib/VMCore/Dominators.cpp b/lib/VMCore/Dominators.cpp index b9eee7f459..14ec3ccd9f 100644 --- a/lib/VMCore/Dominators.cpp +++ b/lib/VMCore/Dominators.cpp @@ -17,8 +17,8 @@ #include "llvm/Analysis/Dominators.h" #include "llvm/Support/CFG.h" #include "llvm/Assembly/Writer.h" -#include "Support/DepthFirstIterator.h" -#include "Support/SetOperations.h" +#include "llvm/ADT/DepthFirstIterator.h" +#include "llvm/ADT/SetOperations.h" #include <algorithm> using namespace llvm; diff --git a/lib/VMCore/Function.cpp b/lib/VMCore/Function.cpp index bf9c8b48bd..e918fd5878 100644 --- a/lib/VMCore/Function.cpp +++ b/lib/VMCore/Function.cpp @@ -17,7 +17,7 @@ #include "llvm/DerivedTypes.h" #include "llvm/Instructions.h" #include "llvm/Intrinsics.h" -#include "Support/LeakDetector.h" +#include "llvm/Support/LeakDetector.h" #include "SymbolTableListTraitsImpl.h" using namespace llvm; diff --git a/lib/VMCore/Globals.cpp b/lib/VMCore/Globals.cpp index cfecbc91ce..b84dbf7fd4 100644 --- a/lib/VMCore/Globals.cpp +++ b/lib/VMCore/Globals.cpp @@ -16,7 +16,7 @@ #include "llvm/GlobalVariable.h" #include "llvm/Module.h" #include "llvm/SymbolTable.h" -#include "Support/LeakDetector.h" +#include "llvm/Support/LeakDetector.h" using namespace llvm; //===----------------------------------------------------------------------===// diff --git a/lib/VMCore/Instruction.cpp b/lib/VMCore/Instruction.cpp index 1350f05b9b..f54acf5f03 100644 --- a/lib/VMCore/Instruction.cpp +++ b/lib/VMCore/Instruction.cpp @@ -14,7 +14,7 @@ #include "llvm/Function.h" #include "llvm/SymbolTable.h" #include "llvm/Type.h" -#include "Support/LeakDetector.h" +#include "llvm/Support/LeakDetector.h" using namespace llvm; void Instruction::init() diff --git a/lib/VMCore/LeakDetector.cpp b/lib/VMCore/LeakDetector.cpp index dbdb7dd70f..807bd22b07 100644 --- a/lib/VMCore/LeakDetector.cpp +++ b/lib/VMCore/LeakDetector.cpp @@ -11,7 +11,7 @@ // //===----------------------------------------------------------------------===// -#include "Support/LeakDetector.h" +#include "llvm/Support/LeakDetector.h" #include "llvm/Value.h" #include <iostream> #include <set> diff --git a/lib/VMCore/Mangler.cpp b/lib/VMCore/Mangler.cpp index ed58da05c9..69bbe261fa 100644 --- a/lib/VMCore/Mangler.cpp +++ b/lib/VMCore/Mangler.cpp @@ -14,7 +14,7 @@ #include "llvm/Support/Mangler.h" #include "llvm/Module.h" #include "llvm/Type.h" -#include "Support/StringExtras.h" +#include "llvm/ADT/StringExtras.h" using namespace llvm; static char HexDigit(int V) { diff --git a/lib/VMCore/Module.cpp b/lib/VMCore/Module.cpp index 125fd123f8..d8caf7f117 100644 --- a/lib/VMCore/Module.cpp +++ b/lib/VMCore/Module.cpp @@ -15,8 +15,8 @@ #include "llvm/InstrTypes.h" #include "llvm/Constants.h" #include "llvm/DerivedTypes.h" -#include "Support/STLExtras.h" -#include "Support/LeakDetector.h" +#include "llvm/ADT/STLExtras.h" +#include "llvm/Support/LeakDetector.h" #include "SymbolTableListTraitsImpl.h" #include <algorithm> #include <cstdarg> diff --git a/lib/VMCore/Pass.cpp b/lib/VMCore/Pass.cpp index d6fe2fba41..5079b4ea65 100644 --- a/lib/VMCore/Pass.cpp +++ b/lib/VMCore/Pass.cpp @@ -17,8 +17,8 @@ #include "PassManagerT.h" // PassManagerT implementation #include "llvm/Module.h" #include "llvm/ModuleProvider.h" -#include "Support/STLExtras.h" -#include "Support/TypeInfo.h" +#include "llvm/ADT/STLExtras.h" +#include "llvm/Support/TypeInfo.h" #include <iostream> #include <set> using namespace llvm; diff --git a/lib/VMCore/PassManagerT.h b/lib/VMCore/PassManagerT.h index 6c60a2d022..95e0f563c9 100644 --- a/lib/VMCore/PassManagerT.h +++ b/lib/VMCore/PassManagerT.h @@ -23,9 +23,9 @@ #define LLVM_PASSMANAGER_T_H #include "llvm/Pass.h" -#include "Support/CommandLine.h" -#include "Support/LeakDetector.h" -#include "Support/Timer.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/LeakDetector.h" +#include "llvm/Support/Timer.h" #include <algorithm> #include <iostream> diff --git a/lib/VMCore/SymbolTable.cpp b/lib/VMCore/SymbolTable.cpp index afbb0b1c21..e5191be198 100644 --- a/lib/VMCore/SymbolTable.cpp +++ b/lib/VMCore/SymbolTable.cpp @@ -15,7 +15,7 @@ #include "llvm/SymbolTable.h" #include "llvm/DerivedTypes.h" #include "llvm/Module.h" -#include "Support/StringExtras.h" +#include "llvm/ADT/StringExtras.h" #include <algorithm> #include <iostream> diff --git a/lib/VMCore/Type.cpp b/lib/VMCore/Type.cpp index bd0da45f46..0c76d1604b 100644 --- a/lib/VMCore/Type.cpp +++ b/lib/VMCore/Type.cpp @@ -15,9 +15,9 @@ #include "llvm/DerivedTypes.h" #include "llvm/SymbolTable.h" #include "llvm/Constants.h" -#include "Support/DepthFirstIterator.h" -#include "Support/StringExtras.h" -#include "Support/STLExtras.h" +#include "llvm/ADT/DepthFirstIterator.h" +#include "llvm/ADT/StringExtras.h" +#include "llvm/ADT/STLExtras.h" #include <algorithm> #include <iostream> using namespace llvm; diff --git a/lib/VMCore/Value.cpp b/lib/VMCore/Value.cpp index e41c7fd136..60be53db5b 100644 --- a/lib/VMCore/Value.cpp +++ b/lib/VMCore/Value.cpp @@ -16,7 +16,7 @@ #include "llvm/DerivedTypes.h" #include "llvm/Constant.h" #include "llvm/GlobalValue.h" -#include "Support/LeakDetector.h" +#include "llvm/Support/LeakDetector.h" #include <algorithm> #include <iostream> using namespace llvm; diff --git a/lib/VMCore/Verifier.cpp b/lib/VMCore/Verifier.cpp index 9e99fe0136..18d9338348 100644 --- a/lib/VMCore/Verifier.cpp +++ b/lib/VMCore/Verifier.cpp @@ -53,7 +53,7 @@ #include "llvm/Analysis/Dominators.h" #include "llvm/Support/CFG.h" #include "llvm/Support/InstVisitor.h" -#include "Support/STLExtras.h" +#include "llvm/ADT/STLExtras.h" #include <algorithm> #include <iostream> #include <sstream> |