diff options
20 files changed, 84 insertions, 136 deletions
diff --git a/clang/include/clang/AST/StmtGraphTraits.h b/clang/include/clang/AST/StmtGraphTraits.h index 11084be40c8..92eb64430f7 100644 --- a/clang/include/clang/AST/StmtGraphTraits.h +++ b/clang/include/clang/AST/StmtGraphTraits.h @@ -31,12 +31,12 @@ template <> struct GraphTraits<clang::Stmt*> { static NodeRef getEntryNode(clang::Stmt *S) { return S; } - static inline ChildIteratorType child_begin(NodeRef N) { + static ChildIteratorType child_begin(NodeRef N) { if (N) return N->child_begin(); else return ChildIteratorType(); } - static inline ChildIteratorType child_end(NodeRef N) { + static ChildIteratorType child_end(NodeRef N) { if (N) return N->child_end(); else return ChildIteratorType(); } @@ -58,12 +58,12 @@ template <> struct GraphTraits<const clang::Stmt*> { static NodeRef getEntryNode(const clang::Stmt *S) { return S; } - static inline ChildIteratorType child_begin(NodeRef N) { + static ChildIteratorType child_begin(NodeRef N) { if (N) return N->child_begin(); else return ChildIteratorType(); } - static inline ChildIteratorType child_end(NodeRef N) { + static ChildIteratorType child_end(NodeRef N) { if (N) return N->child_end(); else return ChildIteratorType(); } diff --git a/clang/include/clang/Analysis/Analyses/Dominators.h b/clang/include/clang/Analysis/Analyses/Dominators.h index 3e625d2102e..1229f8a8efa 100644 --- a/clang/include/clang/Analysis/Analyses/Dominators.h +++ b/clang/include/clang/Analysis/Analyses/Dominators.h @@ -171,8 +171,8 @@ template <> struct GraphTraits< ::clang::DomTreeNode* > { typedef ::clang::DomTreeNode::iterator ChildIteratorType; static NodeRef getEntryNode(NodeRef N) { return N; } - static inline ChildIteratorType child_begin(NodeRef N) { return N->begin(); } - static inline ChildIteratorType child_end(NodeRef N) { return N->end(); } + static ChildIteratorType child_begin(NodeRef N) { return N->begin(); } + static ChildIteratorType child_end(NodeRef N) { return N->end(); } typedef llvm::pointer_iterator<df_iterator<::clang::DomTreeNode *>> nodes_iterator; diff --git a/clang/include/clang/Analysis/CFG.h b/clang/include/clang/Analysis/CFG.h index 36201b052f5..6ee6ce10dd2 100644 --- a/clang/include/clang/Analysis/CFG.h +++ b/clang/include/clang/Analysis/CFG.h @@ -950,11 +950,9 @@ template <> struct GraphTraits< ::clang::CFGBlock *> { static NodeRef getEntryNode(::clang::CFGBlock *BB) { return BB; } - static inline ChildIteratorType child_begin(NodeRef N) { - return N->succ_begin(); - } + static ChildIteratorType child_begin(NodeRef N) { return N->succ_begin(); } - static inline ChildIteratorType child_end(NodeRef N) { return N->succ_end(); } + static ChildIteratorType child_end(NodeRef N) { return N->succ_end(); } }; template <> struct GraphTraits< const ::clang::CFGBlock *> { @@ -963,11 +961,9 @@ template <> struct GraphTraits< const ::clang::CFGBlock *> { static NodeRef getEntryNode(const clang::CFGBlock *BB) { return BB; } - static inline ChildIteratorType child_begin(NodeRef N) { - return N->succ_begin(); - } + static ChildIteratorType child_begin(NodeRef N) { return N->succ_begin(); } - static inline ChildIteratorType child_end(NodeRef N) { return N->succ_end(); } + static ChildIteratorType child_end(NodeRef N) { return N->succ_end(); } }; template <> struct GraphTraits<Inverse< ::clang::CFGBlock*> > { @@ -978,11 +974,9 @@ template <> struct GraphTraits<Inverse< ::clang::CFGBlock*> > { return G.Graph; } - static inline ChildIteratorType child_begin(NodeRef N) { - return N->pred_begin(); - } + static ChildIteratorType child_begin(NodeRef N) { return N->pred_begin(); } - static inline ChildIteratorType child_end(NodeRef N) { return N->pred_end(); } + static ChildIteratorType child_end(NodeRef N) { return N->pred_end(); } }; template <> struct GraphTraits<Inverse<const ::clang::CFGBlock*> > { @@ -993,11 +987,9 @@ template <> struct GraphTraits<Inverse<const ::clang::CFGBlock*> > { return G.Graph; } - static inline ChildIteratorType child_begin(NodeRef N) { - return N->pred_begin(); - } + static ChildIteratorType child_begin(NodeRef N) { return N->pred_begin(); } - static inline ChildIteratorType child_end(NodeRef N) { return N->pred_end(); } + static ChildIteratorType child_end(NodeRef N) { return N->pred_end(); } }; // Traits for: CFG diff --git a/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ExplodedGraph.h b/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ExplodedGraph.h index 48feef413e3..a710ae68be6 100644 --- a/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ExplodedGraph.h +++ b/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ExplodedGraph.h @@ -454,19 +454,15 @@ namespace llvm { typedef clang::ento::ExplodedNode::succ_iterator ChildIteratorType; typedef llvm::df_iterator<NodeRef> nodes_iterator; - static inline NodeRef getEntryNode(NodeRef N) { return N; } + static NodeRef getEntryNode(NodeRef N) { return N; } - static inline ChildIteratorType child_begin(NodeRef N) { - return N->succ_begin(); - } + static ChildIteratorType child_begin(NodeRef N) { return N->succ_begin(); } - static inline ChildIteratorType child_end(NodeRef N) { - return N->succ_end(); - } + static ChildIteratorType child_end(NodeRef N) { return N->succ_end(); } - static inline nodes_iterator nodes_begin(NodeRef N) { return df_begin(N); } + static nodes_iterator nodes_begin(NodeRef N) { return df_begin(N); } - static inline nodes_iterator nodes_end(NodeRef N) { return df_end(N); } + static nodes_iterator nodes_end(NodeRef N) { return df_end(N); } }; template<> struct GraphTraits<const clang::ento::ExplodedNode*> { @@ -474,19 +470,15 @@ namespace llvm { typedef clang::ento::ExplodedNode::const_succ_iterator ChildIteratorType; typedef llvm::df_iterator<NodeRef> nodes_iterator; - static inline NodeRef getEntryNode(NodeRef N) { return N; } + static NodeRef getEntryNode(NodeRef N) { return N; } - static inline ChildIteratorType child_begin(NodeRef N) { - return N->succ_begin(); - } + static ChildIteratorType child_begin(NodeRef N) { return N->succ_begin(); } - static inline ChildIteratorType child_end(NodeRef N) { - return N->succ_end(); - } + static ChildIteratorType child_end(NodeRef N) { return N->succ_end(); } - static inline nodes_iterator nodes_begin(NodeRef N) { return df_begin(N); } + static nodes_iterator nodes_begin(NodeRef N) { return df_begin(N); } - static inline nodes_iterator nodes_end(NodeRef N) { return df_end(N); } + static nodes_iterator nodes_end(NodeRef N) { return df_end(N); } }; } // end llvm namespace diff --git a/llvm/include/llvm/Analysis/CallGraph.h b/llvm/include/llvm/Analysis/CallGraph.h index 58e2a63557f..da2b889f3d1 100644 --- a/llvm/include/llvm/Analysis/CallGraph.h +++ b/llvm/include/llvm/Analysis/CallGraph.h @@ -420,10 +420,10 @@ template <> struct GraphTraits<CallGraphNode *> { typedef mapped_iterator<CallGraphNode::iterator, decltype(&CGNGetValue)> ChildIteratorType; - static inline ChildIteratorType child_begin(NodeRef N) { + static ChildIteratorType child_begin(NodeRef N) { return ChildIteratorType(N->begin(), &CGNGetValue); } - static inline ChildIteratorType child_end(NodeRef N) { + static ChildIteratorType child_end(NodeRef N) { return ChildIteratorType(N->end(), &CGNGetValue); } }; @@ -440,10 +440,10 @@ template <> struct GraphTraits<const CallGraphNode *> { typedef mapped_iterator<CallGraphNode::const_iterator, decltype(&CGNGetValue)> ChildIteratorType; - static inline ChildIteratorType child_begin(NodeRef N) { + static ChildIteratorType child_begin(NodeRef N) { return ChildIteratorType(N->begin(), &CGNGetValue); } - static inline ChildIteratorType child_end(NodeRef N) { + static ChildIteratorType child_end(NodeRef N) { return ChildIteratorType(N->end(), &CGNGetValue); } }; diff --git a/llvm/include/llvm/Analysis/Interval.h b/llvm/include/llvm/Analysis/Interval.h index d16406f096b..a63a004043c 100644 --- a/llvm/include/llvm/Analysis/Interval.h +++ b/llvm/include/llvm/Analysis/Interval.h @@ -127,20 +127,16 @@ template <> struct GraphTraits<Interval*> { static NodeRef getEntryNode(Interval *I) { return I; } /// nodes_iterator/begin/end - Allow iteration over all nodes in the graph - static inline ChildIteratorType child_begin(NodeRef N) { - return succ_begin(N); - } - static inline ChildIteratorType child_end(NodeRef N) { return succ_end(N); } + static ChildIteratorType child_begin(NodeRef N) { return succ_begin(N); } + static ChildIteratorType child_end(NodeRef N) { return succ_end(N); } }; template <> struct GraphTraits<Inverse<Interval*> > { typedef Interval *NodeRef; typedef Interval::pred_iterator ChildIteratorType; static NodeRef getEntryNode(Inverse<Interval *> G) { return G.Graph; } - static inline ChildIteratorType child_begin(NodeRef N) { - return pred_begin(N); - } - static inline ChildIteratorType child_end(NodeRef N) { return pred_end(N); } + static ChildIteratorType child_begin(NodeRef N) { return pred_begin(N); } + static ChildIteratorType child_end(NodeRef N) { return pred_end(N); } }; } // End llvm namespace diff --git a/llvm/include/llvm/Analysis/LoopInfo.h b/llvm/include/llvm/Analysis/LoopInfo.h index 9fc7016f0de..651a749a6d6 100644 --- a/llvm/include/llvm/Analysis/LoopInfo.h +++ b/llvm/include/llvm/Analysis/LoopInfo.h @@ -765,8 +765,8 @@ template <> struct GraphTraits<const Loop*> { typedef LoopInfo::iterator ChildIteratorType; static NodeRef getEntryNode(const Loop *L) { return L; } - static inline ChildIteratorType child_begin(NodeRef N) { return N->begin(); } - static inline ChildIteratorType child_end(NodeRef N) { return N->end(); } + static ChildIteratorType child_begin(NodeRef N) { return N->begin(); } + static ChildIteratorType child_end(NodeRef N) { return N->end(); } }; template <> struct GraphTraits<Loop*> { @@ -774,8 +774,8 @@ template <> struct GraphTraits<Loop*> { typedef LoopInfo::iterator ChildIteratorType; static NodeRef getEntryNode(Loop *L) { return L; } - static inline ChildIteratorType child_begin(NodeRef N) { return N->begin(); } - static inline ChildIteratorType child_end(NodeRef N) { return N->end(); } + static ChildIteratorType child_begin(NodeRef N) { return N->begin(); } + static ChildIteratorType child_end(NodeRef N) { return N->end(); } }; /// \brief Analysis pass that exposes the \c LoopInfo for a function. diff --git a/llvm/include/llvm/CodeGen/MachineBasicBlock.h b/llvm/include/llvm/CodeGen/MachineBasicBlock.h index 04eba064bcf..4f949a6074f 100644 --- a/llvm/include/llvm/CodeGen/MachineBasicBlock.h +++ b/llvm/include/llvm/CodeGen/MachineBasicBlock.h @@ -733,10 +733,8 @@ template <> struct GraphTraits<MachineBasicBlock *> { typedef MachineBasicBlock::succ_iterator ChildIteratorType; static NodeRef getEntryNode(MachineBasicBlock *BB) { return BB; } - static inline ChildIteratorType child_begin(NodeRef N) { - return N->succ_begin(); - } - static inline ChildIteratorType child_end(NodeRef N) { return N->succ_end(); } + static ChildIteratorType child_begin(NodeRef N) { return N->succ_begin(); } + static ChildIteratorType child_end(NodeRef N) { return N->succ_end(); } }; template <> struct GraphTraits<const MachineBasicBlock *> { @@ -744,10 +742,8 @@ template <> struct GraphTraits<const MachineBasicBlock *> { typedef MachineBasicBlock::const_succ_iterator ChildIteratorType; static NodeRef getEntryNode(const MachineBasicBlock *BB) { return BB; } - static inline ChildIteratorType child_begin(NodeRef N) { - return N->succ_begin(); - } - static inline ChildIteratorType child_end(NodeRef N) { return N->succ_end(); } + static ChildIteratorType child_begin(NodeRef N) { return N->succ_begin(); } + static ChildIteratorType child_end(NodeRef N) { return N->succ_end(); } }; // Provide specializations of GraphTraits to be able to treat a @@ -762,10 +758,8 @@ template <> struct GraphTraits<Inverse<MachineBasicBlock*> > { static NodeRef getEntryNode(Inverse<MachineBasicBlock *> G) { return G.Graph; } - static inline ChildIteratorType child_begin(NodeRef N) { - return N->pred_begin(); - } - static inline ChildIteratorType child_end(NodeRef N) { return N->pred_end(); } + static ChildIteratorType child_begin(NodeRef N) { return N->pred_begin(); } + static ChildIteratorType child_end(NodeRef N) { return N->pred_end(); } }; template <> struct GraphTraits<Inverse<const MachineBasicBlock*> > { @@ -774,10 +768,8 @@ template <> struct GraphTraits<Inverse<const MachineBasicBlock*> > { static NodeRef getEntryNode(Inverse<const MachineBasicBlock *> G) { return G.Graph; } - static inline ChildIteratorType child_begin(NodeRef N) { - return N->pred_begin(); - } - static inline ChildIteratorType child_end(NodeRef N) { return N->pred_end(); } + static ChildIteratorType child_begin(NodeRef N) { return N->pred_begin(); } + static ChildIteratorType child_end(NodeRef N) { return N->pred_end(); } }; diff --git a/llvm/include/llvm/CodeGen/MachineDominators.h b/llvm/include/llvm/CodeGen/MachineDominators.h index 7f95b655c7f..76e1df89169 100644 --- a/llvm/include/llvm/CodeGen/MachineDominators.h +++ b/llvm/include/llvm/CodeGen/MachineDominators.h @@ -275,8 +275,8 @@ struct MachineDomTreeGraphTraitsBase { typedef ChildIterator ChildIteratorType; static NodeRef getEntryNode(NodeRef N) { return N; } - static inline ChildIteratorType child_begin(NodeRef N) { return N->begin(); } - static inline ChildIteratorType child_end(NodeRef N) { return N->end(); } + static ChildIteratorType child_begin(NodeRef N) { return N->begin(); } + static ChildIteratorType child_end(NodeRef N) { return N->end(); } }; template <class T> struct GraphTraits; diff --git a/llvm/include/llvm/CodeGen/MachineLoopInfo.h b/llvm/include/llvm/CodeGen/MachineLoopInfo.h index 200234b21c2..dc72ae1810e 100644 --- a/llvm/include/llvm/CodeGen/MachineLoopInfo.h +++ b/llvm/include/llvm/CodeGen/MachineLoopInfo.h @@ -166,8 +166,8 @@ template <> struct GraphTraits<const MachineLoop*> { typedef MachineLoopInfo::iterator ChildIteratorType; static NodeRef getEntryNode(const MachineLoop *L) { return L; } - static inline ChildIteratorType child_begin(NodeRef N) { return N->begin(); } - static inline ChildIteratorType child_end(NodeRef N) { return N->end(); } + static ChildIteratorType child_begin(NodeRef N) { return N->begin(); } + static ChildIteratorType child_end(NodeRef N) { return N->end(); } }; template <> struct GraphTraits<MachineLoop*> { @@ -175,8 +175,8 @@ template <> struct GraphTraits<MachineLoop*> { typedef MachineLoopInfo::iterator ChildIteratorType; static NodeRef getEntryNode(MachineLoop *L) { return L; } - static inline ChildIteratorType child_begin(NodeRef N) { return N->begin(); } - static inline ChildIteratorType child_end(NodeRef N) { return N->end(); } + static ChildIteratorType child_begin(NodeRef N) { return N->begin(); } + static ChildIteratorType child_end(NodeRef N) { return N->end(); } }; } // End llvm namespace diff --git a/llvm/include/llvm/CodeGen/ScheduleDAG.h b/llvm/include/llvm/CodeGen/ScheduleDAG.h index 4d62ee56edf..ed4e0bc8a4a 100644 --- a/llvm/include/llvm/CodeGen/ScheduleDAG.h +++ b/llvm/include/llvm/CodeGen/ScheduleDAG.h @@ -681,11 +681,11 @@ namespace llvm { template <> struct GraphTraits<SUnit*> { typedef SUnit *NodeRef; typedef SUnitIterator ChildIteratorType; - static inline NodeRef getEntryNode(SUnit *N) { return N; } - static inline ChildIteratorType child_begin(NodeRef N) { + static NodeRef getEntryNode(SUnit *N) { return N; } + static ChildIteratorType child_begin(NodeRef N) { return SUnitIterator::begin(N); } - static inline ChildIteratorType child_end(NodeRef N) { + static ChildIteratorType child_end(NodeRef N) { return SUnitIterator::end(N); } }; diff --git a/llvm/include/llvm/CodeGen/SelectionDAGNodes.h b/llvm/include/llvm/CodeGen/SelectionDAGNodes.h index ceeefc49dbf..fad77ae2389 100644 --- a/llvm/include/llvm/CodeGen/SelectionDAGNodes.h +++ b/llvm/include/llvm/CodeGen/SelectionDAGNodes.h @@ -2106,11 +2106,11 @@ public: template <> struct GraphTraits<SDNode*> { typedef SDNode *NodeRef; typedef SDNodeIterator ChildIteratorType; - static inline NodeRef getEntryNode(SDNode *N) { return N; } - static inline ChildIteratorType child_begin(NodeRef N) { + static NodeRef getEntryNode(SDNode *N) { return N; } + static ChildIteratorType child_begin(NodeRef N) { return SDNodeIterator::begin(N); } - static inline ChildIteratorType child_end(NodeRef N) { + static ChildIteratorType child_end(NodeRef N) { return SDNodeIterator::end(N); } }; diff --git a/llvm/include/llvm/IR/CFG.h b/llvm/include/llvm/IR/CFG.h index 9a3d98494da..efbf1098ae5 100644 --- a/llvm/include/llvm/IR/CFG.h +++ b/llvm/include/llvm/IR/CFG.h @@ -158,10 +158,8 @@ template <> struct GraphTraits<BasicBlock*> { typedef succ_iterator ChildIteratorType; static NodeRef getEntryNode(BasicBlock *BB) { return BB; } - static inline ChildIteratorType child_begin(NodeRef N) { - return succ_begin(N); - } - static inline ChildIteratorType child_end(NodeRef N) { return succ_end(N); } + static ChildIteratorType child_begin(NodeRef N) { return succ_begin(N); } + static ChildIteratorType child_end(NodeRef N) { return succ_end(N); } }; template <> struct GraphTraits<const BasicBlock*> { @@ -170,10 +168,8 @@ template <> struct GraphTraits<const BasicBlock*> { static NodeRef getEntryNode(const BasicBlock *BB) { return BB; } - static inline ChildIteratorType child_begin(NodeRef N) { - return succ_begin(N); - } - static inline ChildIteratorType child_end(NodeRef N) { return succ_end(N); } + static ChildIteratorType child_begin(NodeRef N) { return succ_begin(N); } + static ChildIteratorType child_end(NodeRef N) { return succ_end(N); } }; // Provide specializations of GraphTraits to be able to treat a function as a @@ -185,20 +181,16 @@ template <> struct GraphTraits<Inverse<BasicBlock*> > { typedef BasicBlock *NodeRef; typedef pred_iterator ChildIteratorType; static NodeRef getEntryNode(Inverse<BasicBlock *> G) { return G.Graph; } - static inline ChildIteratorType child_begin(NodeRef N) { - return pred_begin(N); - } - static inline ChildIteratorType child_end(NodeRef N) { return pred_end(N); } + static ChildIteratorType child_begin(NodeRef N) { return pred_begin(N); } + static ChildIteratorType child_end(NodeRef N) { return pred_end(N); } }; template <> struct GraphTraits<Inverse<const BasicBlock*> > { typedef const BasicBlock *NodeRef; typedef const_pred_iterator ChildIteratorType; static NodeRef getEntryNode(Inverse<const BasicBlock *> G) { return G.Graph; } - static inline ChildIteratorType child_begin(NodeRef N) { - return pred_begin(N); - } - static inline ChildIteratorType child_end(NodeRef N) { return pred_end(N); } + static ChildIteratorType child_begin(NodeRef N) { return pred_begin(N); } + static ChildIteratorType child_end(NodeRef N) { return pred_end(N); } }; diff --git a/llvm/include/llvm/IR/Dominators.h b/llvm/include/llvm/IR/Dominators.h index 276423aee94..957ac12d10c 100644 --- a/llvm/include/llvm/IR/Dominators.h +++ b/llvm/include/llvm/IR/Dominators.h @@ -160,8 +160,8 @@ template <class Node, class ChildIterator> struct DomTreeGraphTraitsBase { typedef df_iterator<Node *, SmallPtrSet<NodeRef, 8>> nodes_iterator; static NodeRef getEntryNode(NodeRef N) { return N; } - static inline ChildIteratorType child_begin(NodeRef N) { return N->begin(); } - static inline ChildIteratorType child_end(NodeRef N) { return N->end(); } + static ChildIteratorType child_begin(NodeRef N) { return N->begin(); } + static ChildIteratorType child_end(NodeRef N) { return N->end(); } static nodes_iterator nodes_begin(NodeRef N) { return df_begin(getEntryNode(N)); diff --git a/llvm/include/llvm/IR/Type.h b/llvm/include/llvm/IR/Type.h index c4044af88b5..9cf03d86e0d 100644 --- a/llvm/include/llvm/IR/Type.h +++ b/llvm/include/llvm/IR/Type.h @@ -432,26 +432,18 @@ template <> struct GraphTraits<Type *> { typedef Type *NodeRef; typedef Type::subtype_iterator ChildIteratorType; - static inline NodeRef getEntryNode(Type *T) { return T; } - static inline ChildIteratorType child_begin(NodeRef N) { - return N->subtype_begin(); - } - static inline ChildIteratorType child_end(NodeRef N) { - return N->subtype_end(); - } + static NodeRef getEntryNode(Type *T) { return T; } + static ChildIteratorType child_begin(NodeRef N) { return N->subtype_begin(); } + static ChildIteratorType child_end(NodeRef N) { return N->subtype_end(); } }; template <> struct GraphTraits<const Type*> { typedef const Type *NodeRef; typedef Type::subtype_iterator ChildIteratorType; - static inline NodeRef getEntryNode(NodeRef T) { return T; } - static inline ChildIteratorType child_begin(NodeRef N) { - return N->subtype_begin(); - } - static inline ChildIteratorType child_end(NodeRef N) { - return N->subtype_end(); - } + static NodeRef getEntryNode(NodeRef T) { return T; } + static ChildIteratorType child_begin(NodeRef N) { return N->subtype_begin(); } + static ChildIteratorType child_end(NodeRef N) { return N->subtype_end(); } }; // Create wrappers for C Binding types (see CBindingWrapping.h). diff --git a/llvm/include/llvm/Transforms/Utils/MemorySSA.h b/llvm/include/llvm/Transforms/Utils/MemorySSA.h index 8f6669566b6..4f5a64d48c0 100644 --- a/llvm/include/llvm/Transforms/Utils/MemorySSA.h +++ b/llvm/include/llvm/Transforms/Utils/MemorySSA.h @@ -880,10 +880,8 @@ template <> struct GraphTraits<MemoryAccess *> { using ChildIteratorType = memoryaccess_def_iterator; static NodeRef getEntryNode(NodeRef N) { return N; } - static inline ChildIteratorType child_begin(NodeRef N) { - return N->defs_begin(); - } - static inline ChildIteratorType child_end(NodeRef N) { return N->defs_end(); } + static ChildIteratorType child_begin(NodeRef N) { return N->defs_begin(); } + static ChildIteratorType child_end(NodeRef N) { return N->defs_end(); } }; template <> struct GraphTraits<Inverse<MemoryAccess *>> { @@ -891,10 +889,8 @@ template <> struct GraphTraits<Inverse<MemoryAccess *>> { using ChildIteratorType = MemoryAccess::iterator; static NodeRef getEntryNode(NodeRef N) { return N; } - static inline ChildIteratorType child_begin(NodeRef N) { - return N->user_begin(); - } - static inline ChildIteratorType child_end(NodeRef N) { return N->user_end(); } + static ChildIteratorType child_begin(NodeRef N) { return N->user_begin(); } + static ChildIteratorType child_end(NodeRef N) { return N->user_end(); } }; /// \brief Provide an iterator that walks defs, giving both the memory access, diff --git a/llvm/lib/Analysis/BlockFrequencyInfo.cpp b/llvm/lib/Analysis/BlockFrequencyInfo.cpp index 08ace641595..b98869d677e 100644 --- a/llvm/lib/Analysis/BlockFrequencyInfo.cpp +++ b/llvm/lib/Analysis/BlockFrequencyInfo.cpp @@ -64,7 +64,7 @@ struct GraphTraits<BlockFrequencyInfo *> { typedef succ_const_iterator ChildIteratorType; typedef pointer_iterator<Function::const_iterator> nodes_iterator; - static inline NodeRef getEntryNode(const BlockFrequencyInfo *G) { + static NodeRef getEntryNode(const BlockFrequencyInfo *G) { return &G->getFunction()->front(); } static ChildIteratorType child_begin(const NodeRef N) { diff --git a/llvm/lib/CodeGen/MachineBlockFrequencyInfo.cpp b/llvm/lib/CodeGen/MachineBlockFrequencyInfo.cpp index bda6aa4a2bf..d6acc1bc7f4 100644 --- a/llvm/lib/CodeGen/MachineBlockFrequencyInfo.cpp +++ b/llvm/lib/CodeGen/MachineBlockFrequencyInfo.cpp @@ -56,7 +56,7 @@ template <> struct GraphTraits<MachineBlockFrequencyInfo *> { typedef MachineBasicBlock::const_succ_iterator ChildIteratorType; typedef pointer_iterator<MachineFunction::const_iterator> nodes_iterator; - static inline NodeRef getEntryNode(const MachineBlockFrequencyInfo *G) { + static NodeRef getEntryNode(const MachineBlockFrequencyInfo *G) { return &G->getFunction()->front(); } diff --git a/llvm/lib/Transforms/IPO/FunctionAttrs.cpp b/llvm/lib/Transforms/IPO/FunctionAttrs.cpp index 2d897b5cab6..96dcf9de7d5 100644 --- a/llvm/lib/Transforms/IPO/FunctionAttrs.cpp +++ b/llvm/lib/Transforms/IPO/FunctionAttrs.cpp @@ -335,11 +335,9 @@ template <> struct GraphTraits<ArgumentGraphNode *> { typedef ArgumentGraphNode *NodeRef; typedef SmallVectorImpl<ArgumentGraphNode *>::iterator ChildIteratorType; - static inline NodeRef getEntryNode(NodeRef A) { return A; } - static inline ChildIteratorType child_begin(NodeRef N) { - return N->Uses.begin(); - } - static inline ChildIteratorType child_end(NodeRef N) { return N->Uses.end(); } + static NodeRef getEntryNode(NodeRef A) { return A; } + static ChildIteratorType child_begin(NodeRef N) { return N->Uses.begin(); } + static ChildIteratorType child_end(NodeRef N) { return N->Uses.end(); } }; template <> struct GraphTraits<ArgumentGraph *> : public GraphTraits<ArgumentGraphNode *> { diff --git a/llvm/unittests/ADT/TestGraph.h b/llvm/unittests/ADT/TestGraph.h index 91d7333d72f..1c495d24bc0 100644 --- a/llvm/unittests/ADT/TestGraph.h +++ b/llvm/unittests/ADT/TestGraph.h @@ -237,13 +237,11 @@ struct GraphTraits<Graph<N> > { typedef typename Graph<N>::NodeType *NodeRef; typedef typename Graph<N>::ChildIterator ChildIteratorType; - static inline NodeRef getEntryNode(const Graph<N> &G) { - return G.AccessNode(0); - } - static inline ChildIteratorType child_begin(NodeRef Node) { + static NodeRef getEntryNode(const Graph<N> &G) { return G.AccessNode(0); } + static ChildIteratorType child_begin(NodeRef Node) { return Graph<N>::child_begin(Node); } - static inline ChildIteratorType child_end(NodeRef Node) { + static ChildIteratorType child_end(NodeRef Node) { return Graph<N>::child_end(Node); } }; |
