File tree Expand file tree Collapse file tree 3 files changed +8
-30
lines changed Expand file tree Collapse file tree 3 files changed +8
-30
lines changed Original file line number Diff line number Diff line change 12
12
#include " llvm/DebugInfo/GSYM/GsymCreator.h"
13
13
#include " llvm/MC/StringTableBuilder.h"
14
14
#include " llvm/Support/DataExtractor.h"
15
+ #include " llvm/Support/InterleavedRange.h"
15
16
#include " llvm/Support/YAMLParser.h"
16
17
#include " llvm/Support/YAMLTraits.h"
17
18
#include " llvm/Support/raw_ostream.h"
@@ -231,13 +232,7 @@ Error CallSiteInfoLoader::processYAMLFunctions(
231
232
raw_ostream &gsym::operator <<(raw_ostream &OS, const CallSiteInfo &CSI) {
232
233
OS << " Return=" << HEX64 (CSI.ReturnOffset );
233
234
OS << " Flags=" << HEX8 (CSI.Flags );
234
-
235
- OS << " RegEx=" ;
236
- for (uint32_t i = 0 ; i < CSI.MatchRegex .size (); ++i) {
237
- if (i > 0 )
238
- OS << " ," ;
239
- OS << CSI.MatchRegex [i];
240
- }
235
+ OS << " RegEx=" << llvm::interleaved (CSI.MatchRegex , " ," );
241
236
return OS;
242
237
}
243
238
Original file line number Diff line number Diff line change 12
12
#include < tuple>
13
13
14
14
#include " llvm/ADT/STLExtras.h"
15
+ #include " llvm/Support/InterleavedRange.h"
15
16
16
17
namespace llvm {
17
18
namespace exegesis {
@@ -293,15 +294,8 @@ void Instruction::dump(const MCRegisterInfo &RegInfo,
293
294
}
294
295
for (const auto &Var : Variables) {
295
296
Stream << " - Var" << Var.getIndex ();
296
- Stream << " [" ;
297
- bool IsFirst = true ;
298
- for (auto OperandIndex : Var.TiedOperands ) {
299
- if (!IsFirst)
300
- Stream << " ," ;
301
- Stream << " Op" << OperandIndex;
302
- IsFirst = false ;
303
- }
304
- Stream << " ]" ;
297
+ Stream << " " ;
298
+ Stream << llvm::interleaved_array (Var.TiedOperands , " ," );
305
299
Stream << " \n " ;
306
300
}
307
301
if (hasMemoryOperands ())
Original file line number Diff line number Diff line change 13
13
#include " RemarkCounter.h"
14
14
#include " RemarkUtilRegistry.h"
15
15
#include " llvm/Support/CommandLine.h"
16
+ #include " llvm/Support/InterleavedRange.h"
16
17
#include " llvm/Support/Regex.h"
17
18
18
19
using namespace llvm ;
@@ -197,23 +198,11 @@ Error ArgumentCounter::print(StringRef OutputFileName) {
197
198
198
199
auto OF = std::move (*MaybeOF);
199
200
OF->os () << groupByToStr (Group) << " ," ;
200
- unsigned Idx = 0 ;
201
- for (auto [Key, _] : ArgumentSetIdxMap) {
202
- OF->os () << Key;
203
- if (Idx != ArgumentSetIdxMap.size () - 1 )
204
- OF->os () << " ," ;
205
- Idx++;
206
- }
201
+ OF->os () << llvm::interleaved (llvm::make_first_range (ArgumentSetIdxMap), " ," );
207
202
OF->os () << " \n " ;
208
203
for (auto [Header, CountVector] : CountByKeysMap) {
209
204
OF->os () << Header << " ," ;
210
- unsigned Idx = 0 ;
211
- for (auto Count : CountVector) {
212
- OF->os () << Count;
213
- if (Idx != ArgumentSetIdxMap.size () - 1 )
214
- OF->os () << " ," ;
215
- Idx++;
216
- }
205
+ OF->os () << llvm::interleaved (CountVector, " ," );
217
206
OF->os () << " \n " ;
218
207
}
219
208
return Error::success ();
You can’t perform that action at this time.
0 commit comments