Merge pull request #747 from Teemperor/BackportStaticInitFIx

[lldb] Improve error message when running static initializers in an e…

Author: Teemperor

lldb/packages/Python/lldbsuite/test/commands/expression/static-initializers/TestStaticInitializers.py

@@ -30,4 +30,4 @@ def test_failing_init(self):
 
         # FIXME: This error message is not even remotely helpful.
         self.expect("expr -p -- struct Foo2 { Foo2() { do_abort(); } }; Foo2 f;", error=True,
-                    substrs=["error: couldn't run static initializers: couldn't run static initializer:"])
+                    substrs=["error: couldn't run static initializer:"])

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

@@ -658,7 +658,7 @@ bool ClangUserExpression::Parse(DiagnosticManager &diagnostic_manager,
       const char *error_cstr = static_init_error.AsCString();
       if (error_cstr && error_cstr[0])
         diagnostic_manager.Printf(eDiagnosticSeverityError,
-                                  "couldn't run static initializers: %s\n",
+                                  "%s\n",
                                   error_cstr);
       else
         diagnostic_manager.PutString(eDiagnosticSeverityError,