Skip to content

Commit 3a4e598

Browse files
committed
Run GCF
1 parent c67ad40 commit 3a4e598

File tree

4 files changed

+30
-38
lines changed

4 files changed

+30
-38
lines changed

llvm/include/llvm/Object/Minidump.h

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -219,70 +219,67 @@ class MinidumpFile : public Binary {
219219
bool IsEnd;
220220
};
221221

222-
class ExceptionStreamsIterator {
222+
class ExceptionStreamsIterator {
223223
public:
224-
225-
static ExceptionStreamsIterator begin(ArrayRef<minidump::Directory> Streams, const MinidumpFile *File) {
224+
static ExceptionStreamsIterator begin(ArrayRef<minidump::Directory> Streams,
225+
const MinidumpFile *File) {
226226
return ExceptionStreamsIterator(Streams, File);
227227
}
228228

229-
static ExceptionStreamsIterator end() {
230-
return ExceptionStreamsIterator();
231-
}
229+
static ExceptionStreamsIterator end() { return ExceptionStreamsIterator(); }
232230

233231
bool operator==(const ExceptionStreamsIterator &R) const {
234232
return Streams.empty() && R.Streams.empty();
235233
}
236234

237-
bool operator!=(const ExceptionStreamsIterator &R) const { return !(*this == R); }
235+
bool operator!=(const ExceptionStreamsIterator &R) const {
236+
return !(*this == R);
237+
}
238238

239-
Expected<const minidump::ExceptionStream &>
240-
operator*() {
239+
Expected<const minidump::ExceptionStream &> operator*() {
241240
return ReadCurrent();
242241
}
243242

244-
Expected<const minidump::ExceptionStream &>
245-
operator->() {
243+
Expected<const minidump::ExceptionStream &> operator->() {
246244
return ReadCurrent();
247245
}
248246

249-
ExceptionStreamsIterator &
250-
operator++ () {
247+
ExceptionStreamsIterator &operator++() {
251248
if (!Streams.empty())
252249
Streams = Streams.drop_front();
253250

254-
255251
return *this;
256252
}
257253

258254
private:
259-
ExceptionStreamsIterator(ArrayRef<minidump::Directory> Streams, const MinidumpFile *File)
260-
: Streams(Streams), File(File) {}
255+
ExceptionStreamsIterator(ArrayRef<minidump::Directory> Streams,
256+
const MinidumpFile *File)
257+
: Streams(Streams), File(File) {}
261258

262-
ExceptionStreamsIterator() : Streams(ArrayRef<minidump::Directory>()), File(nullptr) {}
259+
ExceptionStreamsIterator()
260+
: Streams(ArrayRef<minidump::Directory>()), File(nullptr) {}
263261

264262
ArrayRef<minidump::Directory> Streams;
265263
const MinidumpFile *File;
266264

267-
Expected<const minidump::ExceptionStream&> ReadCurrent() {
265+
Expected<const minidump::ExceptionStream &> ReadCurrent() {
268266
assert(!Streams.empty());
269267
Expected<const minidump::ExceptionStream &> ExceptionStream =
270268
File->getExceptionStream(Streams.front());
271269
if (!ExceptionStream)
272270
return ExceptionStream.takeError();
273-
271+
274272
return ExceptionStream;
275273
}
276274
};
277275

278276
using FallibleMemory64Iterator = llvm::fallible_iterator<Memory64Iterator>;
279277

280-
/// Returns an iterator that reads each exception stream independently. The
281-
/// contents of the exception strema are not validated before being read, an
278+
/// Returns an iterator that reads each exception stream independently. The
279+
/// contents of the exception strema are not validated before being read, an
282280
/// error will be returned if the stream is not large enough to contain an
283281
/// exception stream, or if the stream points beyond the end of the file.
284-
iterator_range<ExceptionStreamsIterator>
285-
getExceptionStreams() const;
282+
iterator_range<ExceptionStreamsIterator> getExceptionStreams() const;
286283

287284
/// Returns an iterator that pairs each descriptor with it's respective
288285
/// content from the Memory64List stream. An error is returned if the file
@@ -325,7 +322,8 @@ class ExceptionStreamsIterator {
325322
DenseMap<minidump::StreamType, std::size_t> StreamMap,
326323
std::vector<minidump::Directory> ExceptionStreams)
327324
: Binary(ID_Minidump, Source), Header(Header), Streams(Streams),
328-
StreamMap(std::move(StreamMap)), ExceptionStreams(std::move(ExceptionStreams)) {}
325+
StreamMap(std::move(StreamMap)),
326+
ExceptionStreams(std::move(ExceptionStreams)) {}
329327

330328
ArrayRef<uint8_t> getData() const {
331329
return arrayRefFromStringRef(Data.getBuffer());

llvm/lib/Object/Minidump.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,8 @@ MinidumpFile::create(MemoryBufferRef Source) {
166166
return createError("Duplicate stream type");
167167
}
168168

169-
return std::unique_ptr<MinidumpFile>(
170-
new MinidumpFile(Source, Hdr, *ExpectedStreams, std::move(StreamMap), ExceptionStreams));
169+
return std::unique_ptr<MinidumpFile>(new MinidumpFile(
170+
Source, Hdr, *ExpectedStreams, std::move(StreamMap), ExceptionStreams));
171171
}
172172

173173
iterator_range<MinidumpFile::FallibleMemory64Iterator>

llvm/unittests/Object/MinidumpTest.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -751,8 +751,7 @@ TEST(MinidumpFile, getExceptionStream) {
751751
auto ExpectedFile = create(Data);
752752
ASSERT_THAT_EXPECTED(ExpectedFile, Succeeded());
753753
const MinidumpFile &File = **ExpectedFile;
754-
auto ExceptionIterator =
755-
File.getExceptionStreams().begin();
754+
auto ExceptionIterator = File.getExceptionStreams().begin();
756755

757756
Expected<const ExceptionStream &> ExpectedStream = *ExceptionIterator;
758757
ASSERT_THAT_EXPECTED(ExpectedStream, Succeeded());

llvm/unittests/ObjectYAML/MinidumpYAMLTest.cpp

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,7 @@ TEST(MinidumpYAML, ExceptionStream) {
162162

163163
ASSERT_EQ(1u, File.streams().size());
164164

165-
auto ExceptionIterator =
166-
File.getExceptionStreams().begin();
165+
auto ExceptionIterator = File.getExceptionStreams().begin();
167166

168167
Expected<const ExceptionStream &> ExpectedStream = *ExceptionIterator;
169168

@@ -207,8 +206,7 @@ TEST(MinidumpYAML, ExceptionStream_NoParameters) {
207206

208207
ASSERT_EQ(1u, File.streams().size());
209208

210-
auto ExceptionIterator =
211-
File.getExceptionStreams().begin();
209+
auto ExceptionIterator = File.getExceptionStreams().begin();
212210

213211
Expected<const ExceptionStream &> ExpectedStream = *ExceptionIterator;
214212
ASSERT_THAT_EXPECTED(ExpectedStream, Succeeded());
@@ -264,8 +262,7 @@ TEST(MinidumpYAML, ExceptionStream_TooManyParameters) {
264262

265263
ASSERT_EQ(1u, File.streams().size());
266264

267-
auto ExceptionIterator =
268-
File.getExceptionStreams().begin();
265+
auto ExceptionIterator = File.getExceptionStreams().begin();
269266

270267
Expected<const ExceptionStream &> ExpectedStream = *ExceptionIterator;
271268

@@ -317,8 +314,7 @@ TEST(MinidumpYAML, ExceptionStream_ExtraParameter) {
317314

318315
ASSERT_EQ(1u, File.streams().size());
319316

320-
auto ExceptionIterator =
321-
File.getExceptionStreams().begin();
317+
auto ExceptionIterator = File.getExceptionStreams().begin();
322318

323319
Expected<const ExceptionStream &> ExpectedStream = *ExceptionIterator;
324320

@@ -405,7 +401,6 @@ TEST(MinidumpYAML, MemoryRegion_64bit) {
405401
ASSERT_THAT(*DescTwoExpectedContentSlice, arrayRefFromStringRef("world"));
406402

407403
ASSERT_EQ(Iterator, MemoryList.end());
408-
409404
}
410405

411406
// Test that we can parse multiple exception streams.
@@ -434,7 +429,7 @@ TEST(MinidumpYAML, ExceptionStream_MultipleExceptions) {
434429
Exception Record: 0x0102030405060708
435430
Exception Address: 0x0a0b0c0d0e0f1011
436431
Thread Context: 3DeadBeefDefacedABadCafe)");
437-
432+
438433
ASSERT_THAT_EXPECTED(ExpectedFile, Succeeded());
439434
object::MinidumpFile &File = **ExpectedFile;
440435

0 commit comments

Comments
 (0)