Skip to content

Commit 3accff2

Browse files
MaskRayMaskRay
committed
[llvm-objcopy] Fix some namespace style issues
https://llvm.org/docs/CodingStandards.html#use-namespace-qualifiers-to-implement-previously-declared-functions Reviewed By: jhenderson Differential Revision: https://reviews.llvm.org/D104693
1 parent dd1b121 commit 3accff2

File tree

3 files changed

+45
-47
lines changed

3 files changed

+45
-47
lines changed

‎llvm/tools/llvm-objcopy/ConfigManager.cpp

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
#include "llvm/Support/StringSaver.h"
2323
#include <memory>
2424

25-
namespace llvm {
26-
namespace objcopy {
25+
using namespace llvm;
26+
using namespace llvm::objcopy;
2727

2828
namespace {
2929
enum ObjcopyID {
@@ -273,10 +273,12 @@ parseSetSectionFlagValue(StringRef FlagValue) {
273273
return SFU;
274274
}
275275

276+
namespace {
276277
struct TargetInfo {
277278
FileFormat Format;
278279
MachineInfo Machine;
279280
};
281+
} // namespace
280282

281283
// FIXME: consolidate with the bfd parsing used by lld.
282284
static const StringMap<MachineInfo> TargetMap{
@@ -338,10 +340,9 @@ getOutputTargetInfoByTargetName(StringRef TargetName) {
338340
return {TargetInfo{Format, MI}};
339341
}
340342

341-
static Error
342-
addSymbolsFromFile(NameMatcher &Symbols, BumpPtrAllocator &Alloc,
343-
StringRef Filename, MatchStyle MS,
344-
llvm::function_ref<Error(Error)> ErrorCallback) {
343+
static Error addSymbolsFromFile(NameMatcher &Symbols, BumpPtrAllocator &Alloc,
344+
StringRef Filename, MatchStyle MS,
345+
function_ref<Error(Error)> ErrorCallback) {
345346
StringSaver Saver(Alloc);
346347
SmallVector<StringRef, 16> Lines;
347348
auto BufOrErr = MemoryBuffer::getFile(Filename);
@@ -364,7 +365,7 @@ addSymbolsFromFile(NameMatcher &Symbols, BumpPtrAllocator &Alloc,
364365

365366
Expected<NameOrPattern>
366367
NameOrPattern::create(StringRef Pattern, MatchStyle MS,
367-
llvm::function_ref<Error(Error)> ErrorCallback) {
368+
function_ref<Error(Error)> ErrorCallback) {
368369
switch (MS) {
369370
case MatchStyle::Literal:
370371
return NameOrPattern(Pattern);
@@ -630,8 +631,8 @@ Expected<const WasmConfig &> ConfigManager::getWasmConfig() const {
630631
// help flag is set then ParseObjcopyOptions will print the help messege and
631632
// exit.
632633
Expected<DriverConfig>
633-
parseObjcopyOptions(ArrayRef<const char *> RawArgsArr,
634-
llvm::function_ref<Error(Error)> ErrorCallback) {
634+
objcopy::parseObjcopyOptions(ArrayRef<const char *> RawArgsArr,
635+
function_ref<Error(Error)> ErrorCallback) {
635636
DriverConfig DC;
636637
ObjcopyOptTable T;
637638

@@ -1051,7 +1052,7 @@ parseObjcopyOptions(ArrayRef<const char *> RawArgsArr,
10511052
// If a help flag is set then ParseInstallNameToolOptions will print the help
10521053
// messege and exit.
10531054
Expected<DriverConfig>
1054-
parseInstallNameToolOptions(ArrayRef<const char *> ArgsArr) {
1055+
objcopy::parseInstallNameToolOptions(ArrayRef<const char *> ArgsArr) {
10551056
DriverConfig DC;
10561057
ConfigManager ConfigMgr;
10571058
CommonConfig &Config = ConfigMgr.Common;
@@ -1183,7 +1184,7 @@ parseInstallNameToolOptions(ArrayRef<const char *> ArgsArr) {
11831184
}
11841185

11851186
Expected<DriverConfig>
1186-
parseBitcodeStripOptions(ArrayRef<const char *> ArgsArr) {
1187+
objcopy::parseBitcodeStripOptions(ArrayRef<const char *> ArgsArr) {
11871188
DriverConfig DC;
11881189
ConfigManager ConfigMgr;
11891190
CommonConfig &Config = ConfigMgr.Common;
@@ -1231,8 +1232,8 @@ parseBitcodeStripOptions(ArrayRef<const char *> ArgsArr) {
12311232
// help flag is set then ParseStripOptions will print the help messege and
12321233
// exit.
12331234
Expected<DriverConfig>
1234-
parseStripOptions(ArrayRef<const char *> RawArgsArr,
1235-
llvm::function_ref<Error(Error)> ErrorCallback) {
1235+
objcopy::parseStripOptions(ArrayRef<const char *> RawArgsArr,
1236+
function_ref<Error(Error)> ErrorCallback) {
12361237
const char *const *DashDash =
12371238
std::find_if(RawArgsArr.begin(), RawArgsArr.end(),
12381239
[](StringRef Str) { return Str == "--"; });
@@ -1378,6 +1379,3 @@ parseStripOptions(ArrayRef<const char *> RawArgsArr,
13781379

13791380
return std::move(DC);
13801381
}
1381-
1382-
} // namespace objcopy
1383-
} // namespace llvm

‎llvm/tools/llvm-objcopy/ELF/ELFObjcopy.cpp

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@
4545
#include <system_error>
4646
#include <utility>
4747

48-
namespace llvm {
49-
namespace objcopy {
50-
namespace elf {
48+
using namespace llvm;
49+
using namespace llvm::ELF;
50+
using namespace llvm::objcopy;
51+
using namespace llvm::objcopy::elf;
52+
using namespace llvm::object;
5153

52-
using namespace object;
53-
using namespace ELF;
5454
using SectionPred = std::function<bool(const SectionBase &Sec)>;
5555

5656
static bool isDebugSection(const SectionBase &Sec) {
@@ -71,7 +71,7 @@ static bool onlyKeepDWOPred(const Object &Obj, const SectionBase &Sec) {
7171
return !isDWOSection(Sec);
7272
}
7373

74-
uint64_t getNewShfFlags(SectionFlag AllFlags) {
74+
static uint64_t getNewShfFlags(SectionFlag AllFlags) {
7575
uint64_t NewFlags = 0;
7676
if (AllFlags & SectionFlag::SecAlloc)
7777
NewFlags |= ELF::SHF_ALLOC;
@@ -719,9 +719,9 @@ static Error writeOutput(const CommonConfig &Config, Object &Obj,
719719
return Writer->write();
720720
}
721721

722-
Error executeObjcopyOnIHex(const CommonConfig &Config,
723-
const ELFConfig &ELFConfig, MemoryBuffer &In,
724-
raw_ostream &Out) {
722+
Error objcopy::elf::executeObjcopyOnIHex(const CommonConfig &Config,
723+
const ELFConfig &ELFConfig,
724+
MemoryBuffer &In, raw_ostream &Out) {
725725
IHexReader Reader(&In);
726726
Expected<std::unique_ptr<Object>> Obj = Reader.create(true);
727727
if (!Obj)
@@ -734,9 +734,10 @@ Error executeObjcopyOnIHex(const CommonConfig &Config,
734734
return writeOutput(Config, **Obj, Out, OutputElfType);
735735
}
736736

737-
Error executeObjcopyOnRawBinary(const CommonConfig &Config,
738-
const ELFConfig &ELFConfig, MemoryBuffer &In,
739-
raw_ostream &Out) {
737+
Error objcopy::elf::executeObjcopyOnRawBinary(const CommonConfig &Config,
738+
const ELFConfig &ELFConfig,
739+
MemoryBuffer &In,
740+
raw_ostream &Out) {
740741
BinaryReader Reader(&In, ELFConfig.NewSymbolVisibility);
741742
Expected<std::unique_ptr<Object>> Obj = Reader.create(true);
742743
if (!Obj)
@@ -751,9 +752,10 @@ Error executeObjcopyOnRawBinary(const CommonConfig &Config,
751752
return writeOutput(Config, **Obj, Out, OutputElfType);
752753
}
753754

754-
Error executeObjcopyOnBinary(const CommonConfig &Config,
755-
const ELFConfig &ELFConfig,
756-
object::ELFObjectFileBase &In, raw_ostream &Out) {
755+
Error objcopy::elf::executeObjcopyOnBinary(const CommonConfig &Config,
756+
const ELFConfig &ELFConfig,
757+
object::ELFObjectFileBase &In,
758+
raw_ostream &Out) {
757759
ELFReader Reader(&In, Config.ExtractPartition);
758760
Expected<std::unique_ptr<Object>> Obj =
759761
Reader.create(!Config.SymbolsToAdd.empty());
@@ -772,7 +774,3 @@ Error executeObjcopyOnBinary(const CommonConfig &Config,
772774

773775
return Error::success();
774776
}
775-
776-
} // end namespace elf
777-
} // end namespace objcopy
778-
} // end namespace llvm

‎llvm/tools/llvm-objcopy/ELF/Object.cpp

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,10 @@
2929
#include <utility>
3030
#include <vector>
3131

32-
namespace llvm {
33-
namespace objcopy {
34-
namespace elf {
35-
36-
using namespace object;
37-
using namespace ELF;
32+
using namespace llvm;
33+
using namespace llvm::ELF;
34+
using namespace llvm::objcopy::elf;
35+
using namespace llvm::object;
3836

3937
template <class ELFT> void ELFWriter<ELFT>::writePhdr(const Segment &Seg) {
4038
uint8_t *B = reinterpret_cast<uint8_t *>(Buf->getBufferStart()) +
@@ -192,7 +190,7 @@ template <class T> static T checkedGetHex(StringRef S) {
192190
// Fills exactly Len bytes of buffer with hexadecimal characters
193191
// representing value 'X'
194192
template <class T, class Iterator>
195-
static Iterator utohexstr(T X, Iterator It, size_t Len) {
193+
static Iterator toHexStr(T X, Iterator It, size_t Len) {
196194
// Fill range with '0'
197195
std::fill(It, It + Len, '0');
198196

@@ -221,13 +219,13 @@ IHexLineData IHexRecord::getLine(uint8_t Type, uint16_t Addr,
221219
assert(Line.size());
222220
auto Iter = Line.begin();
223221
*Iter++ = ':';
224-
Iter = utohexstr(Data.size(), Iter, 2);
225-
Iter = utohexstr(Addr, Iter, 4);
226-
Iter = utohexstr(Type, Iter, 2);
222+
Iter = toHexStr(Data.size(), Iter, 2);
223+
Iter = toHexStr(Addr, Iter, 4);
224+
Iter = toHexStr(Type, Iter, 2);
227225
for (uint8_t X : Data)
228-
Iter = utohexstr(X, Iter, 2);
226+
Iter = toHexStr(X, Iter, 2);
229227
StringRef S(Line.data() + 1, std::distance(Line.begin() + 1, Iter));
230-
Iter = utohexstr(getChecksum(S), Iter, 2);
228+
Iter = toHexStr(getChecksum(S), Iter, 2);
231229
*Iter++ = '\r';
232230
*Iter++ = '\n';
233231
assert(Iter == Line.end());
@@ -2706,6 +2704,10 @@ Error IHexWriter::finalize() {
27062704
return Error::success();
27072705
}
27082706

2707+
namespace llvm {
2708+
namespace objcopy {
2709+
namespace elf {
2710+
27092711
template class ELFBuilder<ELF64LE>;
27102712
template class ELFBuilder<ELF64BE>;
27112713
template class ELFBuilder<ELF32LE>;

0 commit comments

Comments
 (0)