commit 474d70b2204ee082854049ad691ccf435863709a
author Raphael Isemann <teemperor@gmail.com> Fri Aug 09 08:10:02 2019 +0000
committer Raphael Isemann <teemperor@gmail.com> Fri Aug 09 08:10:02 2019 +0000
tree 5eca87b65739107c5046aa7dd68d2c94fb4c6533
parent dced445b24a3b40243f8aaf7ade104cf167afb9d

[lldb][NFC] Remove last C string uses from IRForTarget

llvm-svn: 368406

lldb/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp

diff --git a/lldb/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp b/lldb/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp
index 4a34aa5..6329f2f 100644
--- a/lldb/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp
+++ b/lldb/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp
@@ -554,10 +554,9 @@
   ValueSymbolTable &value_symbol_table = m_module->getValueSymbolTable();
 
   for (StringMapEntry<llvm::Value *> &value_symbol : value_symbol_table) {
-    std::string value_name = value_symbol.first().str();
-    const char *value_name_cstr = value_name.c_str();
+    llvm::StringRef value_name = value_symbol.first();
 
-    if (strstr(value_name_cstr, "_unnamed_cfstring_")) {
+    if (value_name.contains("_unnamed_cfstring_")) {
       Value *nsstring_value = value_symbol.second;
 
       GlobalVariable *nsstring_global =
@@ -715,11 +714,11 @@
 
       if (log) {
         if (cstr_array)
-          LLDB_LOGF(log, "Found NSString constant %s, which contains \"%s\"",
-                    value_name_cstr, cstr_array->getAsString().str().c_str());
+          LLDB_LOG(log, "Found NSString constant {0}, which contains \"{1}\"",
+                   value_name, cstr_array->getAsString());
         else
-          LLDB_LOGF(log, "Found NSString constant %s, which contains \"\"",
-                    value_name_cstr);
+          LLDB_LOG(log, "Found NSString constant {0}, which contains \"\"",
+                   value_name);
       }
 
       if (!cstr_array)
@@ -738,10 +737,9 @@
   }
 
   for (StringMapEntry<llvm::Value *> &value_symbol : value_symbol_table) {
-    std::string value_name = value_symbol.first().str();
-    const char *value_name_cstr = value_name.c_str();
+    llvm::StringRef value_name = value_symbol.first();
 
-    if (!strcmp(value_name_cstr, "__CFConstantStringClassReference")) {
+    if (value_name == "__CFConstantStringClassReference") {
       GlobalVariable *gv = dyn_cast<GlobalVariable>(value_symbol.second);
 
       if (!gv) {