[Lldb-commits] [lldb] r273445 - Don't omit `this' from expression args if it couldn't be read, but warn loudly.

[Sean Callanan via lldb-commits]

Author: spyffe
Date: Wed Jun 22 12:32:17 2016
New Revision: 273445

URL: http://llvm.org/viewvc/llvm-project?rev=273445&view=rev
Log:
Don't omit `this' from expression args if it couldn't be read, but warn loudly.

<rdar://problem/26935520>

Modified:
    lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp

Modified: lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp?rev=273445&r1=273444&r2=273445&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp (original)
+++ lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp Wed Jun 22 12:32:17 2016
@@ -26,6 +26,7 @@
 #include "ClangDiagnostic.h"
 
 #include "lldb/Core/ConstString.h"
+#include "lldb/Core/Debugger.h"
 #include "lldb/Core/Log.h"
 #include "lldb/Core/Module.h"
 #include "lldb/Core/StreamFile.h"
@@ -641,9 +642,7 @@ ClangUserExpression::AddArguments(Execut
 
         if (!object_ptr_error.Success())
         {
-            diagnostic_manager.Printf(eDiagnosticSeverityWarning,
-                                      "couldn't get required object pointer (substituting NULL): %s",
-                                      object_ptr_error.AsCString());
+            exe_ctx.GetTargetRef().GetDebugger().GetAsyncOutputStream()->Printf("warning: `%s' is not accessible (subsituting 0)\n", object_name.AsCString());
             object_ptr = 0;
         }
 
@@ -661,8 +660,8 @@ ClangUserExpression::AddArguments(Execut
                 cmd_ptr = 0;
             }
         }
-        if (object_ptr)
-            args.push_back(object_ptr);
+        
+        args.push_back(object_ptr);
 
         if (m_in_objectivec_method)
             args.push_back(cmd_ptr);