Skip to content

Commit ea291ae

Browse files
committed
format
1 parent 1a7bd54 commit ea291ae

File tree

1 file changed

+13
-14
lines changed

1 file changed

+13
-14
lines changed

bolt/lib/Rewrite/RewriteInstance.cpp

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -237,12 +237,11 @@ UseGnuStack("use-gnu-stack",
237237
cl::ZeroOrMore,
238238
cl::cat(BoltCategory));
239239

240-
static cl::opt<uint64_t>
241-
CustomAllocationVMA("custom-allocation-vma",
242-
cl::desc("use a custom address at which new code will be put, "
243-
"bypassing BOLT's logic to detect where to put code"),
244-
cl::ZeroOrMore,
245-
cl::cat(BoltCategory));
240+
static cl::opt<uint64_t> CustomAllocationVMA(
241+
"custom-allocation-vma",
242+
cl::desc("use a custom address at which new code will be put, "
243+
"bypassing BOLT's logic to detect where to put code"),
244+
cl::ZeroOrMore, cl::cat(BoltCategory));
246245

247246
static cl::opt<bool>
248247
SequentialDisassembly("sequential-disassembly",
@@ -607,14 +606,14 @@ Error RewriteInstance::discoverStorage() {
607606
// seems off.
608607
for (const ELF64LE::Phdr &Phdr : PHs) {
609608
switch (Phdr.p_type) {
610-
case ELF::PT_LOAD:
611-
if (NextAvailableAddress >= Phdr.p_vaddr &&
612-
NextAvailableAddress < Phdr.p_vaddr + Phdr.p_memsz) {
613-
BC->errs() << "BOLT-WARNING: user-supplied allocation vma 0x"
614-
<< Twine::utohexstr(NextAvailableAddress)
615-
<< " conflicts with ELF segment at 0x"
616-
<< Twine::utohexstr(Phdr.p_vaddr) << "\n";
617-
}
609+
case ELF::PT_LOAD:
610+
if (NextAvailableAddress >= Phdr.p_vaddr &&
611+
NextAvailableAddress < Phdr.p_vaddr + Phdr.p_memsz) {
612+
BC->errs() << "BOLT-WARNING: user-supplied allocation vma 0x"
613+
<< Twine::utohexstr(NextAvailableAddress)
614+
<< " conflicts with ELF segment at 0x"
615+
<< Twine::utohexstr(Phdr.p_vaddr) << "\n";
616+
}
618617
}
619618
}
620619
}

0 commit comments

Comments
 (0)