Skip to content

Commit b5e9f83

Browse files
labathlabath
committed
[lldb] Remove ConstString from ABI, Architecture and Disassembler plugin names
1 parent 71cfce8 commit b5e9f83

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+60
-197
lines changed

‎lldb/include/lldb/Core/PluginManager.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,15 @@ class PluginManager {
5454
static void Terminate();
5555

5656
// ABI
57-
static bool RegisterPlugin(ConstString name, const char *description,
57+
static bool RegisterPlugin(llvm::StringRef name, llvm::StringRef description,
5858
ABICreateInstance create_callback);
5959

6060
static bool UnregisterPlugin(ABICreateInstance create_callback);
6161

6262
static ABICreateInstance GetABICreateCallbackAtIndex(uint32_t idx);
6363

6464
// Architecture
65-
static void RegisterPlugin(ConstString name, llvm::StringRef description,
65+
static void RegisterPlugin(llvm::StringRef name, llvm::StringRef description,
6666
ArchitectureCreateInstance create_callback);
6767

6868
static void UnregisterPlugin(ArchitectureCreateInstance create_callback);
@@ -71,7 +71,7 @@ class PluginManager {
7171
CreateArchitectureInstance(const ArchSpec &arch);
7272

7373
// Disassembler
74-
static bool RegisterPlugin(ConstString name, const char *description,
74+
static bool RegisterPlugin(llvm::StringRef name, llvm::StringRef description,
7575
DisassemblerCreateInstance create_callback);
7676

7777
static bool UnregisterPlugin(DisassemblerCreateInstance create_callback);
@@ -80,7 +80,7 @@ class PluginManager {
8080
GetDisassemblerCreateCallbackAtIndex(uint32_t idx);
8181

8282
static DisassemblerCreateInstance
83-
GetDisassemblerCreateCallbackForPluginName(ConstString name);
83+
GetDisassemblerCreateCallbackForPluginName(llvm::StringRef name);
8484

8585
// DynamicLoader
8686
static bool

‎lldb/source/Core/Disassembler.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,8 @@ DisassemblerSP Disassembler::FindPlugin(const ArchSpec &arch,
6464
DisassemblerCreateInstance create_callback = nullptr;
6565

6666
if (plugin_name) {
67-
ConstString const_plugin_name(plugin_name);
68-
create_callback = PluginManager::GetDisassemblerCreateCallbackForPluginName(
69-
const_plugin_name);
67+
create_callback =
68+
PluginManager::GetDisassemblerCreateCallbackForPluginName(plugin_name);
7069
if (create_callback) {
7170
DisassemblerSP disassembler_sp(create_callback(arch, flavor));
7271

‎lldb/source/Core/PluginManager.cpp

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -285,9 +285,11 @@ static ABIInstances &GetABIInstances() {
285285
return g_instances;
286286
}
287287

288-
bool PluginManager::RegisterPlugin(ConstString name, const char *description,
288+
bool PluginManager::RegisterPlugin(llvm::StringRef name,
289+
llvm::StringRef description,
289290
ABICreateInstance create_callback) {
290-
return GetABIInstances().RegisterPlugin(name, description, create_callback);
291+
return GetABIInstances().RegisterPlugin(
292+
ConstString(name), description.str().c_str(), create_callback);
291293
}
292294

293295
bool PluginManager::UnregisterPlugin(ABICreateInstance create_callback) {
@@ -308,11 +310,11 @@ static ArchitectureInstances &GetArchitectureInstances() {
308310
return g_instances;
309311
}
310312

311-
void PluginManager::RegisterPlugin(ConstString name,
313+
void PluginManager::RegisterPlugin(llvm::StringRef name,
312314
llvm::StringRef description,
313315
ArchitectureCreateInstance create_callback) {
314316
GetArchitectureInstances().push_back(
315-
{name, std::string(description), create_callback});
317+
{ConstString(name), std::string(description), create_callback});
316318
}
317319

318320
void PluginManager::UnregisterPlugin(
@@ -347,10 +349,11 @@ static DisassemblerInstances &GetDisassemblerInstances() {
347349
return g_instances;
348350
}
349351

350-
bool PluginManager::RegisterPlugin(ConstString name, const char *description,
352+
bool PluginManager::RegisterPlugin(llvm::StringRef name,
353+
llvm::StringRef description,
351354
DisassemblerCreateInstance create_callback) {
352-
return GetDisassemblerInstances().RegisterPlugin(name, description,
353-
create_callback);
355+
return GetDisassemblerInstances().RegisterPlugin(
356+
ConstString(name), description.str().c_str(), create_callback);
354357
}
355358

356359
bool PluginManager::UnregisterPlugin(
@@ -364,8 +367,9 @@ PluginManager::GetDisassemblerCreateCallbackAtIndex(uint32_t idx) {
364367
}
365368

366369
DisassemblerCreateInstance
367-
PluginManager::GetDisassemblerCreateCallbackForPluginName(ConstString name) {
368-
return GetDisassemblerInstances().GetCallbackForName(name);
370+
PluginManager::GetDisassemblerCreateCallbackForPluginName(
371+
llvm::StringRef name) {
372+
return GetDisassemblerInstances().GetCallbackForName(ConstString(name));
369373
}
370374

371375
#pragma mark DynamicLoader

‎lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -828,10 +828,3 @@ void ABIMacOSX_arm64::Initialize() {
828828
void ABIMacOSX_arm64::Terminate() {
829829
PluginManager::UnregisterPlugin(CreateInstance);
830830
}
831-
832-
// PluginInterface protocol
833-
834-
ConstString ABIMacOSX_arm64::GetPluginNameStatic() {
835-
static ConstString g_plugin_name("ABIMacOSX_arm64");
836-
return g_plugin_name;
837-
}

‎lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,9 @@ class ABIMacOSX_arm64 : public ABIAArch64 {
7474

7575
// PluginInterface protocol
7676

77-
static lldb_private::ConstString GetPluginNameStatic();
77+
static llvm::StringRef GetPluginNameStatic() { return "ABIMacOSX_arm64"; }
7878

79-
llvm::StringRef GetPluginName() override {
80-
return GetPluginNameStatic().GetStringRef();
81-
}
79+
llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); }
8280

8381
lldb_private::Status
8482
SetReturnValueObject(lldb::StackFrameSP &frame_sp,

‎lldb/source/Plugins/ABI/AArch64/ABISysV_arm64.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -845,8 +845,3 @@ void ABISysV_arm64::Initialize() {
845845
void ABISysV_arm64::Terminate() {
846846
PluginManager::UnregisterPlugin(CreateInstance);
847847
}
848-
849-
lldb_private::ConstString ABISysV_arm64::GetPluginNameStatic() {
850-
static ConstString g_name("SysV-arm64");
851-
return g_name;
852-
}

‎lldb/source/Plugins/ABI/AArch64/ABISysV_arm64.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,11 @@ class ABISysV_arm64 : public ABIAArch64 {
7777

7878
static lldb::ABISP CreateInstance(lldb::ProcessSP process_sp, const lldb_private::ArchSpec &arch);
7979

80-
static lldb_private::ConstString GetPluginNameStatic();
80+
static llvm::StringRef GetPluginNameStatic() { return "SysV-arm64"; }
8181

8282
// PluginInterface protocol
8383

84-
llvm::StringRef GetPluginName() override {
85-
return GetPluginNameStatic().GetStringRef();
86-
}
84+
llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); }
8785

8886
lldb::addr_t FixCodeAddress(lldb::addr_t pc) override;
8987
lldb::addr_t FixDataAddress(lldb::addr_t pc) override;

‎lldb/source/Plugins/ABI/ARC/ABISysV_arc.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -599,8 +599,3 @@ void ABISysV_arc::Initialize() {
599599
void ABISysV_arc::Terminate() {
600600
PluginManager::UnregisterPlugin(CreateInstance);
601601
}
602-
603-
ConstString ABISysV_arc::GetPluginNameStatic() {
604-
static ConstString g_name("sysv-arc");
605-
return g_name;
606-
}

‎lldb/source/Plugins/ABI/ARC/ABISysV_arc.h

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===-- ArchitectureArc.h ---------------------------------------*- C++ -*-===//
1+
//===-- ABISysV_arc.h -------------------------------------------*- C++ -*-===//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.
@@ -80,15 +80,13 @@ class ABISysV_arc : public lldb_private::RegInfoBasedABI {
8080
static lldb::ABISP CreateInstance(lldb::ProcessSP process_sp,
8181
const lldb_private::ArchSpec &arch);
8282

83-
static lldb_private::ConstString GetPluginNameStatic();
83+
static llvm::StringRef GetPluginNameStatic() { return "sysv-arc"; }
8484

8585
//------------------------------------------------------------------
8686
// PluginInterface protocol
8787
//------------------------------------------------------------------
8888

89-
llvm::StringRef GetPluginName() override {
90-
return GetPluginNameStatic().GetStringRef();
91-
}
89+
llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); }
9290

9391
private:
9492
lldb::ValueObjectSP

‎lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1921,8 +1921,3 @@ void ABIMacOSX_arm::Initialize() {
19211921
void ABIMacOSX_arm::Terminate() {
19221922
PluginManager::UnregisterPlugin(CreateInstance);
19231923
}
1924-
1925-
lldb_private::ConstString ABIMacOSX_arm::GetPluginNameStatic() {
1926-
static ConstString g_name("macosx-arm");
1927-
return g_name;
1928-
}

‎lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,11 @@ class ABIMacOSX_arm : public lldb_private::RegInfoBasedABI {
7171

7272
static lldb::ABISP CreateInstance(lldb::ProcessSP process_sp, const lldb_private::ArchSpec &arch);
7373

74-
static lldb_private::ConstString GetPluginNameStatic();
74+
static llvm::StringRef GetPluginNameStatic() { return "macosx-arm"; }
7575

7676
// PluginInterface protocol
7777

78-
llvm::StringRef GetPluginName() override {
79-
return GetPluginNameStatic().GetStringRef();
80-
}
78+
llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); }
8179

8280
protected:
8381
lldb::ValueObjectSP

‎lldb/source/Plugins/ABI/ARM/ABISysV_arm.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2027,8 +2027,3 @@ void ABISysV_arm::Initialize() {
20272027
void ABISysV_arm::Terminate() {
20282028
PluginManager::UnregisterPlugin(CreateInstance);
20292029
}
2030-
2031-
lldb_private::ConstString ABISysV_arm::GetPluginNameStatic() {
2032-
static ConstString g_name("SysV-arm");
2033-
return g_name;
2034-
}

‎lldb/source/Plugins/ABI/ARM/ABISysV_arm.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,11 @@ class ABISysV_arm : public lldb_private::RegInfoBasedABI {
7171

7272
static lldb::ABISP CreateInstance(lldb::ProcessSP process_sp, const lldb_private::ArchSpec &arch);
7373

74-
static lldb_private::ConstString GetPluginNameStatic();
74+
static llvm::StringRef GetPluginNameStatic() { return "SysV-arm"; }
7575

7676
// PluginInterface protocol
7777

78-
llvm::StringRef GetPluginName() override {
79-
return GetPluginNameStatic().GetStringRef();
80-
}
78+
llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); }
8179

8280
protected:
8381
lldb::ValueObjectSP

‎lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1193,11 +1193,6 @@ void ABISysV_hexagon::Terminate() {
11931193
PluginManager::UnregisterPlugin(CreateInstance);
11941194
}
11951195

1196-
lldb_private::ConstString ABISysV_hexagon::GetPluginNameStatic() {
1197-
static ConstString g_name("sysv-hexagon");
1198-
return g_name;
1199-
}
1200-
12011196
// get value object specialized to work with llvm IR types
12021197
lldb::ValueObjectSP
12031198
ABISysV_hexagon::GetReturnValueObjectImpl(lldb_private::Thread &thread,

‎lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,11 @@ class ABISysV_hexagon : public lldb_private::RegInfoBasedABI {
7979

8080
static lldb::ABISP CreateInstance(lldb::ProcessSP process_sp, const lldb_private::ArchSpec &arch);
8181

82-
static lldb_private::ConstString GetPluginNameStatic();
82+
static llvm::StringRef GetPluginNameStatic() { return "sysv-hexagon"; }
8383

8484
// PluginInterface protocol
8585

86-
llvm::StringRef GetPluginName() override {
87-
return GetPluginNameStatic().GetStringRef();
88-
}
86+
llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); }
8987

9088
protected:
9189
void CreateRegisterMapIfNeeded();

‎lldb/source/Plugins/ABI/Mips/ABISysV_mips.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1014,8 +1014,3 @@ void ABISysV_mips::Initialize() {
10141014
void ABISysV_mips::Terminate() {
10151015
PluginManager::UnregisterPlugin(CreateInstance);
10161016
}
1017-
1018-
lldb_private::ConstString ABISysV_mips::GetPluginNameStatic() {
1019-
static ConstString g_name("sysv-mips");
1020-
return g_name;
1021-
}

‎lldb/source/Plugins/ABI/Mips/ABISysV_mips.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,11 @@ class ABISysV_mips : public lldb_private::RegInfoBasedABI {
6969

7070
static lldb::ABISP CreateInstance(lldb::ProcessSP process_sp, const lldb_private::ArchSpec &arch);
7171

72-
static lldb_private::ConstString GetPluginNameStatic();
72+
static llvm::StringRef GetPluginNameStatic() { return "sysv-mips"; }
7373

7474
// PluginInterface protocol
7575

76-
llvm::StringRef GetPluginName() override {
77-
return GetPluginNameStatic().GetStringRef();
78-
}
76+
llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); }
7977

8078
protected:
8179
void CreateRegisterMapIfNeeded();

‎lldb/source/Plugins/ABI/Mips/ABISysV_mips64.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1162,8 +1162,3 @@ void ABISysV_mips64::Initialize() {
11621162
void ABISysV_mips64::Terminate() {
11631163
PluginManager::UnregisterPlugin(CreateInstance);
11641164
}
1165-
1166-
lldb_private::ConstString ABISysV_mips64::GetPluginNameStatic() {
1167-
static ConstString g_name("sysv-mips64");
1168-
return g_name;
1169-
}

‎lldb/source/Plugins/ABI/Mips/ABISysV_mips64.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,11 @@ class ABISysV_mips64 : public lldb_private::RegInfoBasedABI {
8282

8383
static lldb::ABISP CreateInstance(lldb::ProcessSP process_sp, const lldb_private::ArchSpec &arch);
8484

85-
static lldb_private::ConstString GetPluginNameStatic();
85+
static llvm::StringRef GetPluginNameStatic() { return "sysv-mips64"; }
8686

8787
// PluginInterface protocol
8888

89-
llvm::StringRef GetPluginName() override {
90-
return GetPluginNameStatic().GetStringRef();
91-
}
89+
llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); }
9290

9391
protected:
9492
void CreateRegisterMapIfNeeded();

‎lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -962,8 +962,3 @@ void ABISysV_ppc::Initialize() {
962962
void ABISysV_ppc::Terminate() {
963963
PluginManager::UnregisterPlugin(CreateInstance);
964964
}
965-
966-
lldb_private::ConstString ABISysV_ppc::GetPluginNameStatic() {
967-
static ConstString g_name("sysv-ppc");
968-
return g_name;
969-
}

‎lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,11 @@ class ABISysV_ppc : public lldb_private::RegInfoBasedABI {
7878

7979
static lldb::ABISP CreateInstance(lldb::ProcessSP process_sp, const lldb_private::ArchSpec &arch);
8080

81-
static lldb_private::ConstString GetPluginNameStatic();
81+
static llvm::StringRef GetPluginNameStatic() { return "sysv-ppc"; }
8282

8383
// PluginInterface protocol
8484

85-
llvm::StringRef GetPluginName() override {
86-
return GetPluginNameStatic().GetStringRef();
87-
}
85+
llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); }
8886

8987
protected:
9088
void CreateRegisterMapIfNeeded();

‎lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc64.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1074,8 +1074,3 @@ void ABISysV_ppc64::Initialize() {
10741074
void ABISysV_ppc64::Terminate() {
10751075
PluginManager::UnregisterPlugin(CreateInstance);
10761076
}
1077-
1078-
lldb_private::ConstString ABISysV_ppc64::GetPluginNameStatic() {
1079-
static ConstString g_name("sysv-ppc64");
1080-
return g_name;
1081-
}

‎lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc64.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,11 @@ class ABISysV_ppc64 : public lldb_private::RegInfoBasedABI {
7878

7979
static lldb::ABISP CreateInstance(lldb::ProcessSP process_sp, const lldb_private::ArchSpec &arch);
8080

81-
static lldb_private::ConstString GetPluginNameStatic();
81+
static llvm::StringRef GetPluginNameStatic() { return "sysv-ppc64"; }
8282

8383
// PluginInterface protocol
8484

85-
llvm::StringRef GetPluginName() override {
86-
return GetPluginNameStatic().GetStringRef();
87-
}
85+
llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); }
8886

8987
protected:
9088
void CreateRegisterMapIfNeeded();

‎lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -716,8 +716,3 @@ void ABISysV_s390x::Initialize() {
716716
void ABISysV_s390x::Terminate() {
717717
PluginManager::UnregisterPlugin(CreateInstance);
718718
}
719-
720-
lldb_private::ConstString ABISysV_s390x::GetPluginNameStatic() {
721-
static ConstString g_name("sysv-s390x");
722-
return g_name;
723-
}

‎lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,11 @@ class ABISysV_s390x : public lldb_private::RegInfoBasedABI {
7070

7171
static lldb::ABISP CreateInstance(lldb::ProcessSP process_sp, const lldb_private::ArchSpec &arch);
7272

73-
static lldb_private::ConstString GetPluginNameStatic();
73+
static llvm::StringRef GetPluginNameStatic() { return "sysv-s390x"; }
7474

7575
// PluginInterface protocol
7676

77-
llvm::StringRef GetPluginName() override {
78-
return GetPluginNameStatic().GetStringRef();
79-
}
77+
llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); }
8078

8179
protected:
8280
void CreateRegisterMapIfNeeded();

‎lldb/source/Plugins/ABI/X86/ABIMacOSX_i386.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -460,8 +460,3 @@ void ABIMacOSX_i386::Initialize() {
460460
void ABIMacOSX_i386::Terminate() {
461461
PluginManager::UnregisterPlugin(CreateInstance);
462462
}
463-
464-
lldb_private::ConstString ABIMacOSX_i386::GetPluginNameStatic() {
465-
static ConstString g_short_name("abi.macosx-i386");
466-
return g_short_name;
467-
}

0 commit comments

Comments
 (0)