@@ -119,17 +119,17 @@ struct DeinitBarriers final {
119119// / place they can be hoisted to.
120120// /
121121// / Implements BackwardReachability::BlockReachability.
122- class DataFlow final {
122+ class Dataflow final {
123123 Context const &context;
124124 Usage const &uses;
125125 DeinitBarriers &result;
126126
127127 enum class Classification { Barrier, Other };
128128
129- BackwardReachability<DataFlow > reachability;
129+ BackwardReachability<Dataflow > reachability;
130130
131131public:
132- DataFlow (Context const &context, Usage const &uses, DeinitBarriers &result)
132+ Dataflow (Context const &context, Usage const &uses, DeinitBarriers &result)
133133 : context(context), uses(uses), result(result),
134134 reachability (&context.function, *this ) {
135135 // Seed reachability with the scope ending uses from which the backwards
@@ -138,13 +138,13 @@ class DataFlow final {
138138 reachability.initLastUse (end);
139139 }
140140 }
141- DataFlow (DataFlow const &) = delete;
142- DataFlow &operator =(DataFlow const &) = delete ;
141+ Dataflow (Dataflow const &) = delete;
142+ Dataflow &operator =(Dataflow const &) = delete ;
143143
144144 void run () { reachability.solveBackward (); }
145145
146146private:
147- friend class BackwardReachability <DataFlow >;
147+ friend class BackwardReachability <Dataflow >;
148148
149149 bool hasReachableBegin (SILBasicBlock *block) {
150150 return result.hoistingReachesBeginBlocks .contains (block);
@@ -169,8 +169,8 @@ class DataFlow final {
169169 bool checkReachablePhiBarrier (SILBasicBlock *);
170170};
171171
172- DataFlow ::Classification
173- DataFlow ::classifyInstruction (SILInstruction *instruction) {
172+ Dataflow ::Classification
173+ Dataflow ::classifyInstruction (SILInstruction *instruction) {
174174 if (instruction == context.definition ) {
175175 return Classification::Barrier;
176176 }
@@ -183,7 +183,7 @@ DataFlow::classifyInstruction(SILInstruction *instruction) {
183183 return Classification::Other;
184184}
185185
186- bool DataFlow ::classificationIsBarrier (Classification classification) {
186+ bool Dataflow ::classificationIsBarrier (Classification classification) {
187187 switch (classification) {
188188 case Classification::Barrier:
189189 return true ;
@@ -193,7 +193,7 @@ bool DataFlow::classificationIsBarrier(Classification classification) {
193193 llvm_unreachable (" exhaustive switch not exhaustive?!" );
194194}
195195
196- void DataFlow ::visitedInstruction (SILInstruction *instruction,
196+ void Dataflow ::visitedInstruction (SILInstruction *instruction,
197197 Classification classification) {
198198 assert (classifyInstruction (instruction) == classification);
199199 switch (classification) {
@@ -206,13 +206,13 @@ void DataFlow::visitedInstruction(SILInstruction *instruction,
206206 llvm_unreachable (" exhaustive switch not exhaustive?!" );
207207}
208208
209- bool DataFlow ::checkReachableBarrier (SILInstruction *instruction) {
209+ bool Dataflow ::checkReachableBarrier (SILInstruction *instruction) {
210210 auto classification = classifyInstruction (instruction);
211211 visitedInstruction (instruction, classification);
212212 return classificationIsBarrier (classification);
213213}
214214
215- bool DataFlow ::checkReachablePhiBarrier (SILBasicBlock *block) {
215+ bool Dataflow ::checkReachablePhiBarrier (SILBasicBlock *block) {
216216 assert (llvm::all_of (block->getArguments (),
217217 [&](auto argument) { return PhiValue (argument); }));
218218
@@ -342,7 +342,7 @@ bool run(Context &context) {
342342 return false ;
343343
344344 DeinitBarriers barriers (context);
345- DataFlow flow (context, usage, barriers);
345+ Dataflow flow (context, usage, barriers);
346346 flow.run ();
347347
348348 Rewriter rewriter (context, usage, barriers);
0 commit comments