Skip to content

Commit b97afc9

Browse files
JDevlieghereJDevlieghere
committed
[lldb] Update MemoryRegionInfo ctors in unit tests
1 parent b408bbb commit b97afc9

File tree

3 files changed

+94
-85
lines changed

3 files changed

+94
-85
lines changed

‎lldb/unittests/Process/Utility/LinuxProcMapsTest.cpp

Lines changed: 52 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -91,19 +91,20 @@ INSTANTIATE_TEST_SUITE_P(
9191
MemoryRegionInfo::eYes, MemoryRegionInfo::eNo,
9292
MemoryRegionInfo::eYes, ConstString("[abc]"),
9393
MemoryRegionInfo::eDontKnow, 0,
94+
MemoryRegionInfo::eDontKnow,
9495
MemoryRegionInfo::eDontKnow),
9596
},
9697
"unexpected /proc/{pid}/maps exec permission char"),
9798
// Single entry
9899
std::make_tuple(
99100
"55a4512f7000-55a451b68000 rw-p 00000000 00:00 0 [heap]",
100101
MemoryRegionInfos{
101-
MemoryRegionInfo(make_range(0x55a4512f7000, 0x55a451b68000),
102-
MemoryRegionInfo::eYes, MemoryRegionInfo::eYes,
103-
MemoryRegionInfo::eNo, MemoryRegionInfo::eYes,
104-
ConstString("[heap]"),
105-
MemoryRegionInfo::eDontKnow, 0,
106-
MemoryRegionInfo::eDontKnow),
102+
MemoryRegionInfo(
103+
make_range(0x55a4512f7000, 0x55a451b68000),
104+
MemoryRegionInfo::eYes, MemoryRegionInfo::eYes,
105+
MemoryRegionInfo::eNo, MemoryRegionInfo::eYes,
106+
ConstString("[heap]"), MemoryRegionInfo::eDontKnow, 0,
107+
MemoryRegionInfo::eDontKnow, MemoryRegionInfo::eDontKnow),
107108
},
108109
""),
109110
// Multiple entries
@@ -112,18 +113,18 @@ INSTANTIATE_TEST_SUITE_P(
112113
"ffffffffff600000-ffffffffff601000 r-xp 00000000 00:00 0 "
113114
"[vsyscall]",
114115
MemoryRegionInfos{
115-
MemoryRegionInfo(make_range(0x7fc090021000, 0x7fc094000000),
116-
MemoryRegionInfo::eNo, MemoryRegionInfo::eNo,
117-
MemoryRegionInfo::eNo, MemoryRegionInfo::eYes,
118-
ConstString(nullptr),
119-
MemoryRegionInfo::eDontKnow, 0,
120-
MemoryRegionInfo::eDontKnow),
116+
MemoryRegionInfo(
117+
make_range(0x7fc090021000, 0x7fc094000000),
118+
MemoryRegionInfo::eNo, MemoryRegionInfo::eNo,
119+
MemoryRegionInfo::eNo, MemoryRegionInfo::eYes,
120+
ConstString(nullptr), MemoryRegionInfo::eDontKnow, 0,
121+
MemoryRegionInfo::eDontKnow, MemoryRegionInfo::eDontKnow),
121122
MemoryRegionInfo(
122123
make_range(0xffffffffff600000, 0xffffffffff601000),
123124
MemoryRegionInfo::eYes, MemoryRegionInfo::eNo,
124125
MemoryRegionInfo::eYes, MemoryRegionInfo::eYes,
125126
ConstString("[vsyscall]"), MemoryRegionInfo::eDontKnow, 0,
126-
MemoryRegionInfo::eDontKnow),
127+
MemoryRegionInfo::eDontKnow, MemoryRegionInfo::eDontKnow),
127128
},
128129
"")));
129130

@@ -144,12 +145,12 @@ INSTANTIATE_TEST_SUITE_P(
144145
"1111-2222 rw-p 00000000 00:00 0 [foo]\n"
145146
"0/0 rw-p 00000000 00:00 0",
146147
MemoryRegionInfos{
147-
MemoryRegionInfo(make_range(0x1111, 0x2222),
148-
MemoryRegionInfo::eYes, MemoryRegionInfo::eYes,
149-
MemoryRegionInfo::eNo, MemoryRegionInfo::eYes,
150-
ConstString("[foo]"),
151-
MemoryRegionInfo::eDontKnow, 0,
152-
MemoryRegionInfo::eDontKnow),
148+
MemoryRegionInfo(
149+
make_range(0x1111, 0x2222), MemoryRegionInfo::eYes,
150+
MemoryRegionInfo::eYes, MemoryRegionInfo::eNo,
151+
MemoryRegionInfo::eYes, ConstString("[foo]"),
152+
MemoryRegionInfo::eDontKnow, 0, MemoryRegionInfo::eDontKnow,
153+
MemoryRegionInfo::eDontKnow),
153154
},
154155
"malformed /proc/{pid}/smaps entry, missing dash between address "
155156
"range"),
@@ -164,12 +165,12 @@ INSTANTIATE_TEST_SUITE_P(
164165
std::make_tuple(
165166
"1111-2222 rw-p 00000000 00:00 0 [foo]",
166167
MemoryRegionInfos{
167-
MemoryRegionInfo(make_range(0x1111, 0x2222),
168-
MemoryRegionInfo::eYes, MemoryRegionInfo::eYes,
169-
MemoryRegionInfo::eNo, MemoryRegionInfo::eYes,
170-
ConstString("[foo]"),
171-
MemoryRegionInfo::eDontKnow, 0,
172-
MemoryRegionInfo::eDontKnow),
168+
MemoryRegionInfo(
169+
make_range(0x1111, 0x2222), MemoryRegionInfo::eYes,
170+
MemoryRegionInfo::eYes, MemoryRegionInfo::eNo,
171+
MemoryRegionInfo::eYes, ConstString("[foo]"),
172+
MemoryRegionInfo::eDontKnow, 0, MemoryRegionInfo::eDontKnow,
173+
MemoryRegionInfo::eDontKnow),
173174
},
174175
""),
175176
// Single region with flags, other lines ignored
@@ -183,7 +184,8 @@ INSTANTIATE_TEST_SUITE_P(
183184
make_range(0x1111, 0x2222), MemoryRegionInfo::eYes,
184185
MemoryRegionInfo::eYes, MemoryRegionInfo::eNo,
185186
MemoryRegionInfo::eYes, ConstString("[foo]"),
186-
MemoryRegionInfo::eDontKnow, 0, MemoryRegionInfo::eYes),
187+
MemoryRegionInfo::eDontKnow, 0, MemoryRegionInfo::eYes,
188+
MemoryRegionInfo::eDontKnow),
187189
},
188190
""),
189191
// Whitespace ignored
@@ -195,7 +197,8 @@ INSTANTIATE_TEST_SUITE_P(
195197
MemoryRegionInfo::eYes, MemoryRegionInfo::eNo,
196198
MemoryRegionInfo::eYes, ConstString(nullptr),
197199
MemoryRegionInfo::eDontKnow, 0,
198-
MemoryRegionInfo::eYes),
200+
MemoryRegionInfo::eYes,
201+
MemoryRegionInfo::eDontKnow),
199202
},
200203
""),
201204
// VmFlags line means it has flag info, but nothing is set
@@ -207,7 +210,8 @@ INSTANTIATE_TEST_SUITE_P(
207210
MemoryRegionInfo::eYes, MemoryRegionInfo::eNo,
208211
MemoryRegionInfo::eYes, ConstString(nullptr),
209212
MemoryRegionInfo::eDontKnow, 0,
210-
MemoryRegionInfo::eNo),
213+
MemoryRegionInfo::eNo,
214+
MemoryRegionInfo::eDontKnow),
211215
},
212216
""),
213217
// Handle some pages not having a flags line
@@ -218,17 +222,18 @@ INSTANTIATE_TEST_SUITE_P(
218222
"3333-4444 r-xp 00000000 00:00 0 [bar]\n"
219223
"VmFlags: mt",
220224
MemoryRegionInfos{
221-
MemoryRegionInfo(make_range(0x1111, 0x2222),
222-
MemoryRegionInfo::eYes, MemoryRegionInfo::eYes,
223-
MemoryRegionInfo::eNo, MemoryRegionInfo::eYes,
224-
ConstString("[foo]"),
225-
MemoryRegionInfo::eDontKnow, 0,
226-
MemoryRegionInfo::eDontKnow),
225+
MemoryRegionInfo(
226+
make_range(0x1111, 0x2222), MemoryRegionInfo::eYes,
227+
MemoryRegionInfo::eYes, MemoryRegionInfo::eNo,
228+
MemoryRegionInfo::eYes, ConstString("[foo]"),
229+
MemoryRegionInfo::eDontKnow, 0, MemoryRegionInfo::eDontKnow,
230+
MemoryRegionInfo::eDontKnow),
227231
MemoryRegionInfo(
228232
make_range(0x3333, 0x4444), MemoryRegionInfo::eYes,
229233
MemoryRegionInfo::eNo, MemoryRegionInfo::eYes,
230234
MemoryRegionInfo::eYes, ConstString("[bar]"),
231-
MemoryRegionInfo::eDontKnow, 0, MemoryRegionInfo::eYes),
235+
MemoryRegionInfo::eDontKnow, 0, MemoryRegionInfo::eYes,
236+
MemoryRegionInfo::eDontKnow),
232237
},
233238
""),
234239
// Handle no pages having a flags line (older kernels)
@@ -240,18 +245,18 @@ INSTANTIATE_TEST_SUITE_P(
240245
"KernelPageSize: 4 kB\n"
241246
"MMUPageSize: 4 kB\n",
242247
MemoryRegionInfos{
243-
MemoryRegionInfo(make_range(0x1111, 0x2222),
244-
MemoryRegionInfo::eYes, MemoryRegionInfo::eYes,
245-
MemoryRegionInfo::eNo, MemoryRegionInfo::eYes,
246-
ConstString(nullptr),
247-
MemoryRegionInfo::eDontKnow, 0,
248-
MemoryRegionInfo::eDontKnow),
249-
MemoryRegionInfo(make_range(0x3333, 0x4444),
250-
MemoryRegionInfo::eYes, MemoryRegionInfo::eNo,
251-
MemoryRegionInfo::eYes, MemoryRegionInfo::eYes,
252-
ConstString(nullptr),
253-
MemoryRegionInfo::eDontKnow, 0,
254-
MemoryRegionInfo::eDontKnow),
248+
MemoryRegionInfo(
249+
make_range(0x1111, 0x2222), MemoryRegionInfo::eYes,
250+
MemoryRegionInfo::eYes, MemoryRegionInfo::eNo,
251+
MemoryRegionInfo::eYes, ConstString(nullptr),
252+
MemoryRegionInfo::eDontKnow, 0, MemoryRegionInfo::eDontKnow,
253+
MemoryRegionInfo::eDontKnow),
254+
MemoryRegionInfo(
255+
make_range(0x3333, 0x4444), MemoryRegionInfo::eYes,
256+
MemoryRegionInfo::eNo, MemoryRegionInfo::eYes,
257+
MemoryRegionInfo::eYes, ConstString(nullptr),
258+
MemoryRegionInfo::eDontKnow, 0, MemoryRegionInfo::eDontKnow,
259+
MemoryRegionInfo::eDontKnow),
255260
},
256261
"")));
257262

‎lldb/unittests/Process/Utility/MemoryTagManagerAArch64MTETest.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,8 @@ static MemoryRegionInfo MakeRegionInfo(lldb::addr_t base, lldb::addr_t size,
138138
MemoryRegionInfo::eYes, MemoryRegionInfo::eYes, MemoryRegionInfo::eYes,
139139
ConstString(), MemoryRegionInfo::eNo, 0,
140140
/*memory_tagged=*/
141-
tagged ? MemoryRegionInfo::eYes : MemoryRegionInfo::eNo);
141+
tagged ? MemoryRegionInfo::eYes : MemoryRegionInfo::eNo,
142+
MemoryRegionInfo::eDontKnow);
142143
}
143144

144145
TEST(MemoryTagManagerAArch64MTETest, MakeTaggedRange) {

‎lldb/unittests/Process/minidump/MinidumpParserTest.cpp

Lines changed: 40 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -376,18 +376,19 @@ TEST_F(MinidumpParserTest, GetMemoryRegionInfo) {
376376

377377
EXPECT_THAT(
378378
parser->BuildMemoryRegions(),
379-
testing::Pair(testing::ElementsAre(
380-
MemoryRegionInfo({0x0, 0x10000}, no, no, no, no,
381-
ConstString(), unknown, 0, unknown),
382-
MemoryRegionInfo({0x10000, 0x21000}, yes, yes, no, yes,
383-
ConstString(), unknown, 0, unknown),
384-
MemoryRegionInfo({0x40000, 0x1000}, yes, no, no, yes,
385-
ConstString(), unknown, 0, unknown),
386-
MemoryRegionInfo({0x7ffe0000, 0x1000}, yes, no, no, yes,
387-
ConstString(), unknown, 0, unknown),
388-
MemoryRegionInfo({0x7ffe1000, 0xf000}, no, no, no, yes,
389-
ConstString(), unknown, 0, unknown)),
390-
true));
379+
testing::Pair(
380+
testing::ElementsAre(
381+
MemoryRegionInfo({0x0, 0x10000}, no, no, no, no, ConstString(),
382+
unknown, 0, unknown, unknown),
383+
MemoryRegionInfo({0x10000, 0x21000}, yes, yes, no, yes,
384+
ConstString(), unknown, 0, unknown, unknown),
385+
MemoryRegionInfo({0x40000, 0x1000}, yes, no, no, yes,
386+
ConstString(), unknown, 0, unknown, unknown),
387+
MemoryRegionInfo({0x7ffe0000, 0x1000}, yes, no, no, yes,
388+
ConstString(), unknown, 0, unknown, unknown),
389+
MemoryRegionInfo({0x7ffe1000, 0xf000}, no, no, no, yes,
390+
ConstString(), unknown, 0, unknown, unknown)),
391+
true));
391392
}
392393

393394
TEST_F(MinidumpParserTest, GetMemoryRegionInfoFromMemoryList) {
@@ -412,9 +413,9 @@ TEST_F(MinidumpParserTest, GetMemoryRegionInfoFromMemoryList) {
412413
testing::Pair(
413414
testing::ElementsAre(
414415
MemoryRegionInfo({0x1000, 0x10}, yes, unknown, unknown, yes,
415-
ConstString(), unknown, 0, unknown),
416+
ConstString(), unknown, 0, unknown, unknown),
416417
MemoryRegionInfo({0x2000, 0x20}, yes, unknown, unknown, yes,
417-
ConstString(), unknown, 0, unknown)),
418+
ConstString(), unknown, 0, unknown, unknown)),
418419
false));
419420
}
420421

@@ -428,9 +429,9 @@ TEST_F(MinidumpParserTest, GetMemoryRegionInfoFromMemory64List) {
428429
testing::Pair(
429430
testing::ElementsAre(
430431
MemoryRegionInfo({0x1000, 0x10}, yes, unknown, unknown, yes,
431-
ConstString(), unknown, 0, unknown),
432+
ConstString(), unknown, 0, unknown, unknown),
432433
MemoryRegionInfo({0x2000, 0x20}, yes, unknown, unknown, yes,
433-
ConstString(), unknown, 0, unknown)),
434+
ConstString(), unknown, 0, unknown, unknown)),
434435
false));
435436
}
436437

@@ -455,22 +456,23 @@ TEST_F(MinidumpParserTest, GetMemoryRegionInfoLinuxMaps) {
455456
ConstString app_process("/system/bin/app_process");
456457
ConstString linker("/system/bin/linker");
457458
ConstString liblog("/system/lib/liblog.so");
458-
EXPECT_THAT(parser->BuildMemoryRegions(),
459-
testing::Pair(
460-
testing::ElementsAre(
461-
MemoryRegionInfo({0x400d9000, 0x2000}, yes, no, yes, yes,
462-
app_process, unknown, 0, unknown),
463-
MemoryRegionInfo({0x400db000, 0x1000}, yes, no, no, yes,
464-
app_process, unknown, 0, unknown),
465-
MemoryRegionInfo({0x400dc000, 0x1000}, yes, yes, no, yes,
466-
ConstString(), unknown, 0, unknown),
467-
MemoryRegionInfo({0x400ec000, 0x1000}, yes, no, no, yes,
468-
ConstString(), unknown, 0, unknown),
469-
MemoryRegionInfo({0x400ee000, 0x1000}, yes, yes, no, yes,
470-
linker, unknown, 0, unknown),
471-
MemoryRegionInfo({0x400fc000, 0x1000}, yes, yes, yes, yes,
472-
liblog, unknown, 0, unknown)),
473-
true));
459+
EXPECT_THAT(
460+
parser->BuildMemoryRegions(),
461+
testing::Pair(
462+
testing::ElementsAre(
463+
MemoryRegionInfo({0x400d9000, 0x2000}, yes, no, yes, yes,
464+
app_process, unknown, 0, unknown, unknown),
465+
MemoryRegionInfo({0x400db000, 0x1000}, yes, no, no, yes,
466+
app_process, unknown, 0, unknown, unknown),
467+
MemoryRegionInfo({0x400dc000, 0x1000}, yes, yes, no, yes,
468+
ConstString(), unknown, 0, unknown, unknown),
469+
MemoryRegionInfo({0x400ec000, 0x1000}, yes, no, no, yes,
470+
ConstString(), unknown, 0, unknown, unknown),
471+
MemoryRegionInfo({0x400ee000, 0x1000}, yes, yes, no, yes, linker,
472+
unknown, 0, unknown, unknown),
473+
MemoryRegionInfo({0x400fc000, 0x1000}, yes, yes, yes, yes, liblog,
474+
unknown, 0, unknown, unknown)),
475+
true));
474476
}
475477

476478
TEST_F(MinidumpParserTest, GetMemoryRegionInfoLinuxMapsError) {
@@ -486,11 +488,12 @@ TEST_F(MinidumpParserTest, GetMemoryRegionInfoLinuxMapsError) {
486488
llvm::Succeeded());
487489
// Test that when a /proc/maps region fails to parse
488490
// we handle the error and continue with the rest.
489-
EXPECT_THAT(parser->BuildMemoryRegions(),
490-
testing::Pair(testing::ElementsAre(MemoryRegionInfo(
491-
{0x400fc000, 0x1000}, yes, yes, yes, yes,
492-
ConstString(nullptr), unknown, 0, unknown)),
493-
true));
491+
EXPECT_THAT(
492+
parser->BuildMemoryRegions(),
493+
testing::Pair(testing::ElementsAre(MemoryRegionInfo(
494+
{0x400fc000, 0x1000}, yes, yes, yes, yes,
495+
ConstString(nullptr), unknown, 0, unknown, unknown)),
496+
true));
494497
}
495498

496499
// Windows Minidump tests

0 commit comments

Comments
 (0)