@@ -107,15 +107,16 @@ bool all_of_tuple_elements(const TupleTy &Ops, Fn P) {
107107
108108} // namespace detail
109109
110- template <typename Ops_t, typename SCEVTy> struct SCEV_match {
110+ template <typename Ops_t, typename SCEVTy> struct SCEVExpr_match {
111111 Ops_t Ops;
112112
113- SCEV_match () : Ops() {
113+ SCEVExpr_match () : Ops() {
114114 static_assert (std::tuple_size<Ops_t>::value == 0 &&
115115 " constructor can only be used with zero operands" );
116116 }
117- SCEV_match (Ops_t Ops) : Ops(Ops) {}
118- template <typename A_t, typename B_t> SCEV_match (A_t A, B_t B) : Ops({A, B}) {
117+ SCEVExpr_match (Ops_t Ops) : Ops(Ops) {}
118+ template <typename A_t, typename B_t>
119+ SCEVExpr_match (A_t A, B_t B) : Ops({A, B}) {
119120 static_assert (std::tuple_size<Ops_t>::value == 2 &&
120121 " constructor can only be used for binary matcher" );
121122 }
@@ -131,38 +132,38 @@ template <typename Ops_t, typename SCEVTy> struct SCEV_match {
131132};
132133
133134template <typename Op0_t, typename Op1_t, typename SCEVTy>
134- using BinarySCEV_match = SCEV_match <std::tuple<Op0_t, Op1_t>, SCEVTy>;
135+ using BinarySCEVExpr_match = SCEVExpr_match <std::tuple<Op0_t, Op1_t>, SCEVTy>;
135136
136137template <typename Op0_t, typename Op1_t, typename SCEVTy>
137- inline BinarySCEV_match <Op0_t, Op1_t, SCEVTy> m_scev_Binary ( const Op0_t &Op0,
138- const Op1_t &Op1) {
139- return BinarySCEV_match <Op0_t, Op1_t, SCEVTy>(Op0, Op1);
138+ inline BinarySCEVExpr_match <Op0_t, Op1_t, SCEVTy>
139+ m_scev_Binary ( const Op0_t &Op0, const Op1_t &Op1) {
140+ return BinarySCEVExpr_match <Op0_t, Op1_t, SCEVTy>(Op0, Op1);
140141}
141142
142143template <typename Op0_t, typename Op1_t>
143- inline BinarySCEV_match <Op0_t, Op1_t, SCEVAddExpr>
144+ inline BinarySCEVExpr_match <Op0_t, Op1_t, SCEVAddExpr>
144145m_scev_Add (const Op0_t &Op0, const Op1_t &Op1) {
145- return BinarySCEV_match <Op0_t, Op1_t, SCEVAddExpr>(Op0, Op1);
146+ return BinarySCEVExpr_match <Op0_t, Op1_t, SCEVAddExpr>(Op0, Op1);
146147}
147148
148149template <typename Op0_t, typename SCEVTy>
149- using UnarySCEV_match = SCEV_match <std::tuple<Op0_t>, SCEVTy>;
150+ using UnarySCEVExpr_match = SCEVExpr_match <std::tuple<Op0_t>, SCEVTy>;
150151
151152template <typename Op0_t, typename Op1_t, typename SCEVTy>
152- inline UnarySCEV_match <Op0_t, SCEVTy> m_scev_Unary (const Op0_t &Op0) {
153- return UnarySCEV_match <Op0_t, SCEVTy>(Op0);
153+ inline UnarySCEVExpr_match <Op0_t, SCEVTy> m_scev_Unary (const Op0_t &Op0) {
154+ return UnarySCEVExpr_match <Op0_t, SCEVTy>(Op0);
154155}
155156
156157template <typename Op0_t>
157- inline UnarySCEV_match <Op0_t, SCEVSignExtendExpr>
158+ inline UnarySCEVExpr_match <Op0_t, SCEVSignExtendExpr>
158159m_scev_SExt (const Op0_t &Op0) {
159- return UnarySCEV_match <Op0_t, SCEVSignExtendExpr>(Op0);
160+ return UnarySCEVExpr_match <Op0_t, SCEVSignExtendExpr>(Op0);
160161}
161162
162163template <typename Op0_t>
163- inline UnarySCEV_match <Op0_t, SCEVZeroExtendExpr>
164+ inline UnarySCEVExpr_match <Op0_t, SCEVZeroExtendExpr>
164165m_scev_ZExt (const Op0_t &Op0) {
165- return UnarySCEV_match <Op0_t, SCEVZeroExtendExpr>(Op0);
166+ return UnarySCEVExpr_match <Op0_t, SCEVZeroExtendExpr>(Op0);
166167}
167168
168169} // namespace SCEVPatternMatch
0 commit comments