diff options
| -rw-r--r-- | llvm/include/llvm/Analysis/LazyCallGraph.h | 6 | ||||
| -rw-r--r-- | llvm/include/llvm/IR/PassManager.h | 2 | ||||
| -rw-r--r-- | llvm/lib/Analysis/LazyCallGraph.cpp | 6 |
3 files changed, 0 insertions, 14 deletions
diff --git a/llvm/include/llvm/Analysis/LazyCallGraph.h b/llvm/include/llvm/Analysis/LazyCallGraph.h index 82dea95e2a0..cf686807b87 100644 --- a/llvm/include/llvm/Analysis/LazyCallGraph.h +++ b/llvm/include/llvm/Analysis/LazyCallGraph.h @@ -186,13 +186,11 @@ public: /// graph remains valid for the module. It is also relatively expensive. LazyCallGraph(const LazyCallGraph &G); -#if LLVM_HAS_RVALUE_REFERENCES /// \brief Move constructor. /// /// This is a deep move. It leaves G in an undefined but destroyable state. /// Any other operation on G is likely to fail. LazyCallGraph(LazyCallGraph &&G); -#endif iterator begin() { return iterator(*this, EntryNodes); } iterator end() { return iterator(*this, EntryNodes, iterator::IsAtEndT()); } @@ -236,10 +234,8 @@ private: /// \brief Helper to copy a node from another graph into this one. Node *copyInto(const Node &OtherN); -#if LLVM_HAS_RVALUE_REFERENCES /// \brief Helper to move a node from another graph into this one. Node *moveInto(Node &&OtherN); -#endif }; /// \brief A node in the call graph. @@ -262,10 +258,8 @@ class LazyCallGraph::Node { /// \brief Constructor used when copying a node from one graph to another. Node(LazyCallGraph &G, const Node &OtherN); -#if LLVM_HAS_RVALUE_REFERENCES /// \brief Constructor used when moving a node from one graph to another. Node(LazyCallGraph &G, Node &&OtherN); -#endif public: typedef LazyCallGraph::iterator iterator; diff --git a/llvm/include/llvm/IR/PassManager.h b/llvm/include/llvm/IR/PassManager.h index 93d04344f8c..b1057b50322 100644 --- a/llvm/include/llvm/IR/PassManager.h +++ b/llvm/include/llvm/IR/PassManager.h @@ -106,7 +106,6 @@ public: PreservedPassIDs.erase(*I); } -#if LLVM_HAS_RVALUE_REFERENCES /// \brief Intersect this set with a temporary other set in place. /// /// This is a mutating operation on this preserved set, removing all @@ -124,7 +123,6 @@ public: if (!Arg.PreservedPassIDs.count(*I)) PreservedPassIDs.erase(*I); } -#endif /// \brief Query whether a pass is marked as preserved by this set. template <typename PassT> bool preserved() const { diff --git a/llvm/lib/Analysis/LazyCallGraph.cpp b/llvm/lib/Analysis/LazyCallGraph.cpp index 7ae63e27c61..9e0559829de 100644 --- a/llvm/lib/Analysis/LazyCallGraph.cpp +++ b/llvm/lib/Analysis/LazyCallGraph.cpp @@ -83,7 +83,6 @@ LazyCallGraph::Node::Node(LazyCallGraph &G, const Node &OtherN) Callees.push_back(G.copyInto(*OI->get<Node *>())); } -#if LLVM_HAS_RVALUE_REFERENCES LazyCallGraph::Node::Node(LazyCallGraph &G, Node &&OtherN) : G(G), F(OtherN.F), Callees(std::move(OtherN.Callees)), CalleeSet(std::move(OtherN.CalleeSet)) { @@ -94,7 +93,6 @@ LazyCallGraph::Node::Node(LazyCallGraph &G, Node &&OtherN) if (Node *ChildN = CI->dyn_cast<Node *>()) *CI = G.moveInto(std::move(*ChildN)); } -#endif LazyCallGraph::LazyCallGraph(Module &M) : M(M) { for (Module::iterator FI = M.begin(), FE = M.end(); FI != FE; ++FI) @@ -125,7 +123,6 @@ LazyCallGraph::LazyCallGraph(const LazyCallGraph &G) EntryNodes.push_back(copyInto(*EI->get<Node *>())); } -#if LLVM_HAS_RVALUE_REFERENCES // FIXME: This would be crazy simpler if BumpPtrAllocator were movable without // invalidating any of the allocated memory. We should make that be the case at // some point and delete this. @@ -141,7 +138,6 @@ LazyCallGraph::LazyCallGraph(LazyCallGraph &&G) if (Node *EntryN = EI->dyn_cast<Node *>()) *EI = moveInto(std::move(*EntryN)); } -#endif LazyCallGraph::Node *LazyCallGraph::insertInto(Function &F, Node *&MappedN) { return new (MappedN = BPA.Allocate()) Node(*this, F); @@ -155,7 +151,6 @@ LazyCallGraph::Node *LazyCallGraph::copyInto(const Node &OtherN) { return new (N = BPA.Allocate()) Node(*this, OtherN); } -#if LLVM_HAS_RVALUE_REFERENCES LazyCallGraph::Node *LazyCallGraph::moveInto(Node &&OtherN) { Node *&N = NodeMap[&OtherN.F]; if (N) @@ -163,7 +158,6 @@ LazyCallGraph::Node *LazyCallGraph::moveInto(Node &&OtherN) { return new (N = BPA.Allocate()) Node(*this, std::move(OtherN)); } -#endif char LazyCallGraphAnalysis::PassID; |
