[Lldb-commits] [lldb] e2d8aa6 - [lldb] Re-add nullptr check to IRForTarget::RewriteObjCConstString log statement

[Raphael Isemann via lldb-commits]

Author: Raphael Isemann
Date: 2020-03-16T16:28:36+01:00
New Revision: e2d8aa6bf774ef29e134c40f886c55557bb5f970

URL: https://github.com/llvm/llvm-project/commit/e2d8aa6bf774ef29e134c40f886c55557bb5f970
DIFF: https://github.com/llvm/llvm-project/commit/e2d8aa6bf774ef29e134c40f886c55557bb5f970.diff

LOG: [lldb] Re-add nullptr check to IRForTarget::RewriteObjCConstString log statement

The nullptr check here was removed in 4ef50a33b12825593a82ca8ea97158b7b71b348e
when I replaced (nearly) all log->Print to LLDB_LOG calls (which automatically
check for this stuff). But it seems this one call escaped my sed call.

Currently working on a test that can cover this code path but we can revert
this until I have found one.

Added: 
    

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

Removed: 
    


################################################################################
diff  --git a/lldb/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp b/lldb/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp
index e70ab1ce8d5a..b9442872c785 100644
--- a/lldb/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp
+++ b/lldb/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp
@@ -427,7 +427,7 @@ bool IRForTarget::RewriteObjCConstString(llvm::GlobalVariable *ns_str,
         m_execution_unit.FindSymbol(g_CFStringCreateWithBytes_str, 
                                     missing_weak);
     if (CFStringCreateWithBytes_addr == LLDB_INVALID_ADDRESS || missing_weak) {
-        log->PutCString("Couldn't find CFStringCreateWithBytes in the target");
+      LLDB_LOG(log, "Couldn't find CFStringCreateWithBytes in the target");
 
       m_error_stream.Printf("Error [IRForTarget]: Rewriting an Objective-C "
                             "constant string requires "