Author: adrian Date: Tue Oct 8 09:29:36 2019 New Revision: 374081 URL: http://llvm.org/viewvc/llvm-project?rev=374081&view=rev Log: Replace static const StringRef with StringRef (NFC)
Differential Revision: https://reviews.llvm.org/D68597 Modified: lldb/trunk/source/Interpreter/OptionValueBoolean.cpp lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp lldb/trunk/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp Modified: lldb/trunk/source/Interpreter/OptionValueBoolean.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/OptionValueBoolean.cpp?rev=374081&r1=374080&r2=374081&view=diff ============================================================================== --- lldb/trunk/source/Interpreter/OptionValueBoolean.cpp (original) +++ lldb/trunk/source/Interpreter/OptionValueBoolean.cpp Tue Oct 8 09:29:36 2019 @@ -73,10 +73,10 @@ lldb::OptionValueSP OptionValueBoolean:: void OptionValueBoolean::AutoComplete(CommandInterpreter &interpreter, CompletionRequest &request) { - static const llvm::StringRef g_autocomplete_entries[] = { - "true", "false", "on", "off", "yes", "no", "1", "0"}; + llvm::StringRef autocomplete_entries[] = {"true", "false", "on", "off", + "yes", "no", "1", "0"}; - auto entries = llvm::makeArrayRef(g_autocomplete_entries); + auto entries = llvm::makeArrayRef(autocomplete_entries); // only suggest "true" or "false" by default if (request.GetCursorArgumentPrefix().empty()) Modified: lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp?rev=374081&r1=374080&r2=374081&view=diff ============================================================================== --- lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp (original) +++ lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp Tue Oct 8 09:29:36 2019 @@ -2029,8 +2029,8 @@ lldb::addr_t AppleObjCRuntimeV2::LookupR if (name_cstr) { llvm::StringRef name_strref(name_cstr); - static const llvm::StringRef ivar_prefix("OBJC_IVAR_$_"); - static const llvm::StringRef class_prefix("OBJC_CLASS_$_"); + llvm::StringRef ivar_prefix("OBJC_IVAR_$_"); + llvm::StringRef class_prefix("OBJC_CLASS_$_"); if (name_strref.startswith(ivar_prefix)) { llvm::StringRef ivar_skipped_prefix = Modified: lldb/trunk/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp?rev=374081&r1=374080&r2=374081&view=diff ============================================================================== --- lldb/trunk/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp (original) +++ lldb/trunk/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp Tue Oct 8 09:29:36 2019 @@ -2059,9 +2059,9 @@ size_t ObjectFileMachO::ParseSymtab() { uint32_t i; FileSpecList dylib_files; Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_SYMBOLS)); - static const llvm::StringRef g_objc_v2_prefix_class("_OBJC_CLASS_$_"); - static const llvm::StringRef g_objc_v2_prefix_metaclass("_OBJC_METACLASS_$_"); - static const llvm::StringRef g_objc_v2_prefix_ivar("_OBJC_IVAR_$_"); + llvm::StringRef g_objc_v2_prefix_class("_OBJC_CLASS_$_"); + llvm::StringRef g_objc_v2_prefix_metaclass("_OBJC_METACLASS_$_"); + llvm::StringRef g_objc_v2_prefix_ivar("_OBJC_IVAR_$_"); for (i = 0; i < m_header.ncmds; ++i) { const lldb::offset_t cmd_offset = offset; @@ -3314,13 +3314,13 @@ size_t ObjectFileMachO::ParseSymtab() { if (symbol_name) { llvm::StringRef symbol_name_ref(symbol_name); if (symbol_name_ref.startswith("_OBJC_")) { - static const llvm::StringRef + llvm::StringRef g_objc_v2_prefix_class( "_OBJC_CLASS_$_"); - static const llvm::StringRef + llvm::StringRef g_objc_v2_prefix_metaclass( "_OBJC_METACLASS_$_"); - static const llvm::StringRef + llvm::StringRef g_objc_v2_prefix_ivar("_OBJC_IVAR_$_"); if (symbol_name_ref.startswith( g_objc_v2_prefix_class)) { @@ -3370,7 +3370,7 @@ size_t ObjectFileMachO::ParseSymtab() { type = eSymbolTypeRuntime; if (symbol_name && symbol_name[0] == '.') { llvm::StringRef symbol_name_ref(symbol_name); - static const llvm::StringRef + llvm::StringRef g_objc_v1_prefix_class(".objc_class_name_"); if (symbol_name_ref.startswith( g_objc_v1_prefix_class)) { @@ -4206,11 +4206,11 @@ size_t ObjectFileMachO::ParseSymtab() { if (symbol_name) { llvm::StringRef symbol_name_ref(symbol_name); if (symbol_name_ref.startswith("_OBJC_")) { - static const llvm::StringRef g_objc_v2_prefix_class( + llvm::StringRef g_objc_v2_prefix_class( "_OBJC_CLASS_$_"); - static const llvm::StringRef g_objc_v2_prefix_metaclass( + llvm::StringRef g_objc_v2_prefix_metaclass( "_OBJC_METACLASS_$_"); - static const llvm::StringRef g_objc_v2_prefix_ivar( + llvm::StringRef g_objc_v2_prefix_ivar( "_OBJC_IVAR_$_"); if (symbol_name_ref.startswith(g_objc_v2_prefix_class)) { symbol_name_non_abi_mangled = symbol_name + 1; @@ -4250,7 +4250,7 @@ size_t ObjectFileMachO::ParseSymtab() { type = eSymbolTypeRuntime; if (symbol_name && symbol_name[0] == '.') { llvm::StringRef symbol_name_ref(symbol_name); - static const llvm::StringRef g_objc_v1_prefix_class( + llvm::StringRef g_objc_v1_prefix_class( ".objc_class_name_"); if (symbol_name_ref.startswith(g_objc_v1_prefix_class)) { symbol_name_non_abi_mangled = symbol_name; _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
