[llvm] 3accff2 - [llvm-objcopy] Fix some namespace style issues
Fangrui Song via llvm-commits
llvm-commits at lists.llvm.org
Tue Jun 22 09:19:53 PDT 2021
Author: Fangrui Song
Date: 2021-06-22T09:19:48-07:00
New Revision: 3accff2553c00c3237876edd6066e1701c52e66c
URL: https://github.com/llvm/llvm-project/commit/3accff2553c00c3237876edd6066e1701c52e66c
DIFF: https://github.com/llvm/llvm-project/commit/3accff2553c00c3237876edd6066e1701c52e66c.diff
LOG: [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
Added:
Modified:
llvm/tools/llvm-objcopy/ConfigManager.cpp
llvm/tools/llvm-objcopy/ELF/ELFObjcopy.cpp
llvm/tools/llvm-objcopy/ELF/Object.cpp
Removed:
################################################################################
diff --git a/llvm/tools/llvm-objcopy/ConfigManager.cpp b/llvm/tools/llvm-objcopy/ConfigManager.cpp
index e29d07db6f3b0..39c5857e2c3f3 100644
--- a/llvm/tools/llvm-objcopy/ConfigManager.cpp
+++ b/llvm/tools/llvm-objcopy/ConfigManager.cpp
@@ -22,8 +22,8 @@
#include "llvm/Support/StringSaver.h"
#include <memory>
-namespace llvm {
-namespace objcopy {
+using namespace llvm;
+using namespace llvm::objcopy;
namespace {
enum ObjcopyID {
@@ -273,10 +273,12 @@ parseSetSectionFlagValue(StringRef FlagValue) {
return SFU;
}
+namespace {
struct TargetInfo {
FileFormat Format;
MachineInfo Machine;
};
+} // namespace
// FIXME: consolidate with the bfd parsing used by lld.
static const StringMap<MachineInfo> TargetMap{
@@ -338,10 +340,9 @@ getOutputTargetInfoByTargetName(StringRef TargetName) {
return {TargetInfo{Format, MI}};
}
-static Error
-addSymbolsFromFile(NameMatcher &Symbols, BumpPtrAllocator &Alloc,
- StringRef Filename, MatchStyle MS,
- llvm::function_ref<Error(Error)> ErrorCallback) {
+static Error addSymbolsFromFile(NameMatcher &Symbols, BumpPtrAllocator &Alloc,
+ StringRef Filename, MatchStyle MS,
+ function_ref<Error(Error)> ErrorCallback) {
StringSaver Saver(Alloc);
SmallVector<StringRef, 16> Lines;
auto BufOrErr = MemoryBuffer::getFile(Filename);
@@ -364,7 +365,7 @@ addSymbolsFromFile(NameMatcher &Symbols, BumpPtrAllocator &Alloc,
Expected<NameOrPattern>
NameOrPattern::create(StringRef Pattern, MatchStyle MS,
- llvm::function_ref<Error(Error)> ErrorCallback) {
+ function_ref<Error(Error)> ErrorCallback) {
switch (MS) {
case MatchStyle::Literal:
return NameOrPattern(Pattern);
@@ -630,8 +631,8 @@ Expected<const WasmConfig &> ConfigManager::getWasmConfig() const {
// help flag is set then ParseObjcopyOptions will print the help messege and
// exit.
Expected<DriverConfig>
-parseObjcopyOptions(ArrayRef<const char *> RawArgsArr,
- llvm::function_ref<Error(Error)> ErrorCallback) {
+objcopy::parseObjcopyOptions(ArrayRef<const char *> RawArgsArr,
+ function_ref<Error(Error)> ErrorCallback) {
DriverConfig DC;
ObjcopyOptTable T;
@@ -1051,7 +1052,7 @@ parseObjcopyOptions(ArrayRef<const char *> RawArgsArr,
// If a help flag is set then ParseInstallNameToolOptions will print the help
// messege and exit.
Expected<DriverConfig>
-parseInstallNameToolOptions(ArrayRef<const char *> ArgsArr) {
+objcopy::parseInstallNameToolOptions(ArrayRef<const char *> ArgsArr) {
DriverConfig DC;
ConfigManager ConfigMgr;
CommonConfig &Config = ConfigMgr.Common;
@@ -1183,7 +1184,7 @@ parseInstallNameToolOptions(ArrayRef<const char *> ArgsArr) {
}
Expected<DriverConfig>
-parseBitcodeStripOptions(ArrayRef<const char *> ArgsArr) {
+objcopy::parseBitcodeStripOptions(ArrayRef<const char *> ArgsArr) {
DriverConfig DC;
ConfigManager ConfigMgr;
CommonConfig &Config = ConfigMgr.Common;
@@ -1231,8 +1232,8 @@ parseBitcodeStripOptions(ArrayRef<const char *> ArgsArr) {
// help flag is set then ParseStripOptions will print the help messege and
// exit.
Expected<DriverConfig>
-parseStripOptions(ArrayRef<const char *> RawArgsArr,
- llvm::function_ref<Error(Error)> ErrorCallback) {
+objcopy::parseStripOptions(ArrayRef<const char *> RawArgsArr,
+ function_ref<Error(Error)> ErrorCallback) {
const char *const *DashDash =
std::find_if(RawArgsArr.begin(), RawArgsArr.end(),
[](StringRef Str) { return Str == "--"; });
@@ -1378,6 +1379,3 @@ parseStripOptions(ArrayRef<const char *> RawArgsArr,
return std::move(DC);
}
-
-} // namespace objcopy
-} // namespace llvm
diff --git a/llvm/tools/llvm-objcopy/ELF/ELFObjcopy.cpp b/llvm/tools/llvm-objcopy/ELF/ELFObjcopy.cpp
index e400882ec20d9..986eeca6256c3 100644
--- a/llvm/tools/llvm-objcopy/ELF/ELFObjcopy.cpp
+++ b/llvm/tools/llvm-objcopy/ELF/ELFObjcopy.cpp
@@ -45,12 +45,12 @@
#include <system_error>
#include <utility>
-namespace llvm {
-namespace objcopy {
-namespace elf {
+using namespace llvm;
+using namespace llvm::ELF;
+using namespace llvm::objcopy;
+using namespace llvm::objcopy::elf;
+using namespace llvm::object;
-using namespace object;
-using namespace ELF;
using SectionPred = std::function<bool(const SectionBase &Sec)>;
static bool isDebugSection(const SectionBase &Sec) {
@@ -71,7 +71,7 @@ static bool onlyKeepDWOPred(const Object &Obj, const SectionBase &Sec) {
return !isDWOSection(Sec);
}
-uint64_t getNewShfFlags(SectionFlag AllFlags) {
+static uint64_t getNewShfFlags(SectionFlag AllFlags) {
uint64_t NewFlags = 0;
if (AllFlags & SectionFlag::SecAlloc)
NewFlags |= ELF::SHF_ALLOC;
@@ -719,9 +719,9 @@ static Error writeOutput(const CommonConfig &Config, Object &Obj,
return Writer->write();
}
-Error executeObjcopyOnIHex(const CommonConfig &Config,
- const ELFConfig &ELFConfig, MemoryBuffer &In,
- raw_ostream &Out) {
+Error objcopy::elf::executeObjcopyOnIHex(const CommonConfig &Config,
+ const ELFConfig &ELFConfig,
+ MemoryBuffer &In, raw_ostream &Out) {
IHexReader Reader(&In);
Expected<std::unique_ptr<Object>> Obj = Reader.create(true);
if (!Obj)
@@ -734,9 +734,10 @@ Error executeObjcopyOnIHex(const CommonConfig &Config,
return writeOutput(Config, **Obj, Out, OutputElfType);
}
-Error executeObjcopyOnRawBinary(const CommonConfig &Config,
- const ELFConfig &ELFConfig, MemoryBuffer &In,
- raw_ostream &Out) {
+Error objcopy::elf::executeObjcopyOnRawBinary(const CommonConfig &Config,
+ const ELFConfig &ELFConfig,
+ MemoryBuffer &In,
+ raw_ostream &Out) {
BinaryReader Reader(&In, ELFConfig.NewSymbolVisibility);
Expected<std::unique_ptr<Object>> Obj = Reader.create(true);
if (!Obj)
@@ -751,9 +752,10 @@ Error executeObjcopyOnRawBinary(const CommonConfig &Config,
return writeOutput(Config, **Obj, Out, OutputElfType);
}
-Error executeObjcopyOnBinary(const CommonConfig &Config,
- const ELFConfig &ELFConfig,
- object::ELFObjectFileBase &In, raw_ostream &Out) {
+Error objcopy::elf::executeObjcopyOnBinary(const CommonConfig &Config,
+ const ELFConfig &ELFConfig,
+ object::ELFObjectFileBase &In,
+ raw_ostream &Out) {
ELFReader Reader(&In, Config.ExtractPartition);
Expected<std::unique_ptr<Object>> Obj =
Reader.create(!Config.SymbolsToAdd.empty());
@@ -772,7 +774,3 @@ Error executeObjcopyOnBinary(const CommonConfig &Config,
return Error::success();
}
-
-} // end namespace elf
-} // end namespace objcopy
-} // end namespace llvm
diff --git a/llvm/tools/llvm-objcopy/ELF/Object.cpp b/llvm/tools/llvm-objcopy/ELF/Object.cpp
index 5f1b4c30fb788..0255fdaec5d46 100644
--- a/llvm/tools/llvm-objcopy/ELF/Object.cpp
+++ b/llvm/tools/llvm-objcopy/ELF/Object.cpp
@@ -29,12 +29,10 @@
#include <utility>
#include <vector>
-namespace llvm {
-namespace objcopy {
-namespace elf {
-
-using namespace object;
-using namespace ELF;
+using namespace llvm;
+using namespace llvm::ELF;
+using namespace llvm::objcopy::elf;
+using namespace llvm::object;
template <class ELFT> void ELFWriter<ELFT>::writePhdr(const Segment &Seg) {
uint8_t *B = reinterpret_cast<uint8_t *>(Buf->getBufferStart()) +
@@ -192,7 +190,7 @@ template <class T> static T checkedGetHex(StringRef S) {
// Fills exactly Len bytes of buffer with hexadecimal characters
// representing value 'X'
template <class T, class Iterator>
-static Iterator utohexstr(T X, Iterator It, size_t Len) {
+static Iterator toHexStr(T X, Iterator It, size_t Len) {
// Fill range with '0'
std::fill(It, It + Len, '0');
@@ -221,13 +219,13 @@ IHexLineData IHexRecord::getLine(uint8_t Type, uint16_t Addr,
assert(Line.size());
auto Iter = Line.begin();
*Iter++ = ':';
- Iter = utohexstr(Data.size(), Iter, 2);
- Iter = utohexstr(Addr, Iter, 4);
- Iter = utohexstr(Type, Iter, 2);
+ Iter = toHexStr(Data.size(), Iter, 2);
+ Iter = toHexStr(Addr, Iter, 4);
+ Iter = toHexStr(Type, Iter, 2);
for (uint8_t X : Data)
- Iter = utohexstr(X, Iter, 2);
+ Iter = toHexStr(X, Iter, 2);
StringRef S(Line.data() + 1, std::distance(Line.begin() + 1, Iter));
- Iter = utohexstr(getChecksum(S), Iter, 2);
+ Iter = toHexStr(getChecksum(S), Iter, 2);
*Iter++ = '\r';
*Iter++ = '\n';
assert(Iter == Line.end());
@@ -2706,6 +2704,10 @@ Error IHexWriter::finalize() {
return Error::success();
}
+namespace llvm {
+namespace objcopy {
+namespace elf {
+
template class ELFBuilder<ELF64LE>;
template class ELFBuilder<ELF64BE>;
template class ELFBuilder<ELF32LE>;
More information about the llvm-commits
mailing list