Skip to content

Commit 06732f0

Browse files
committed
Run GCF
1 parent bb7bf1f commit 06732f0

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
lines changed

llvm/include/llvm/Object/Minidump.h

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,6 @@ class MinidumpFile : public Binary {
183183
object_error::unexpected_eof);
184184
}
185185

186-
187186
ArrayRef<uint8_t> Content = Storage.take_front(Descriptor.DataSize);
188187
Current = std::make_pair(Descriptor, Content);
189188

@@ -200,9 +199,9 @@ class MinidumpFile : public Binary {
200199
// if the first descriptor is readable.
201200
Memory64Iterator(ArrayRef<uint8_t> Storage,
202201
ArrayRef<minidump::MemoryDescriptor_64> Descriptors)
203-
: Storage(Storage), Descriptors(Descriptors),
204-
IsEnd(false) {
205-
assert(Descriptors.size() > 0 && Storage.size() >= Descriptors.front().DataSize);
202+
: Storage(Storage), Descriptors(Descriptors), IsEnd(false) {
203+
assert(Descriptors.size() > 0 &&
204+
Storage.size() >= Descriptors.front().DataSize);
206205
minidump::MemoryDescriptor_64 Descriptor = Descriptors.front();
207206
ArrayRef<uint8_t> Content = Storage.take_front(Descriptor.DataSize);
208207
Current = std::make_pair(Descriptor, Content);
@@ -226,8 +225,7 @@ class MinidumpFile : public Binary {
226225
/// content from the Memory64List stream. An error is returned if the file
227226
/// does not contain a Memory64List stream, or if the descriptor data is
228227
/// unreadable.
229-
iterator_range<FallibleMemory64Iterator>
230-
getMemory64List(Error &Err) const;
228+
iterator_range<FallibleMemory64Iterator> getMemory64List(Error &Err) const;
231229

232230
/// Returns the list of descriptors embedded in the MemoryInfoList stream. The
233231
/// descriptors provide properties (e.g. permissions) of interesting regions

llvm/lib/Object/Minidump.cpp

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,13 @@ MinidumpFile::create(MemoryBufferRef Source) {
156156
new MinidumpFile(Source, Hdr, *ExpectedStreams, std::move(StreamMap)));
157157
}
158158

159-
static iterator_range<MinidumpFile::FallibleMemory64Iterator> makeEmptyRange(Error &Err) {
160-
return make_range(llvm::object::MinidumpFile::FallibleMemory64Iterator::itr(llvm::object::MinidumpFile::Memory64Iterator::end(), Err),
161-
llvm::object::MinidumpFile::FallibleMemory64Iterator::end(llvm::object::MinidumpFile::Memory64Iterator::end()));
159+
static iterator_range<MinidumpFile::FallibleMemory64Iterator>
160+
makeEmptyRange(Error &Err) {
161+
return make_range(
162+
llvm::object::MinidumpFile::FallibleMemory64Iterator::itr(
163+
llvm::object::MinidumpFile::Memory64Iterator::end(), Err),
164+
llvm::object::MinidumpFile::FallibleMemory64Iterator::end(
165+
llvm::object::MinidumpFile::Memory64Iterator::end()));
162166
}
163167

164168
iterator_range<MinidumpFile::FallibleMemory64Iterator>
@@ -192,9 +196,9 @@ MinidumpFile::getMemory64List(Error &Err) const {
192196
return makeEmptyRange(Err);
193197
}
194198

195-
return make_range(
196-
FallibleMemory64Iterator::itr(
197-
Memory64Iterator::begin(getData().slice(ListHeader->BaseRVA), *Descriptors),
198-
Err),
199-
FallibleMemory64Iterator::end(Memory64Iterator::end()));
199+
return make_range(FallibleMemory64Iterator::itr(
200+
Memory64Iterator::begin(
201+
getData().slice(ListHeader->BaseRVA), *Descriptors),
202+
Err),
203+
FallibleMemory64Iterator::end(Memory64Iterator::end()));
200204
}

llvm/lib/ObjectYAML/MinidumpYAML.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@ Stream::create(const Directory &StreamDesc, const object::MinidumpFile &File) {
535535
return Err;
536536
std::vector<Memory64ListStream::entry_type> Ranges;
537537
for (const auto &Pair : Memory64List) {
538-
Ranges.push_back({Pair.first, Pair.second});
538+
Ranges.push_back({Pair.first, Pair.second});
539539
}
540540

541541
// If we don't have an error, or if any of the reads succeed, return ranges

llvm/unittests/ObjectYAML/MinidumpYAMLTest.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -367,8 +367,6 @@ TEST(MinidumpYAML, MemoryRegion_64bit) {
367367
*ExpectedMemoryList;
368368
auto Iterator = MemoryList.begin();
369369

370-
371-
372370
auto DescOnePair = *Iterator;
373371
const minidump::MemoryDescriptor_64 &DescOne = DescOnePair.first;
374372
ASSERT_THAT(DescOne.StartOfMemoryRange, 0x7FFFFFCF0818283u);

0 commit comments

Comments
 (0)