From: Walter Erquinigo <a20012251@gmail.com>
Date: Wed, 31 Mar 2021 00:53:57 +0000 (-0700)
Subject: Fix errors in 0b69756110db444282c40ea16929186b2910c3b1
X-Git-Tag: llvmorg-14-init~10848
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a4ee79c8ae5ca1bbfa8d78a2782918d1f23f15b2;p=platform%2Fupstream%2Fllvm.git

Fix errors in 0b69756110db444282c40ea16929186b2910c3b1

Errors found in
https://lab.llvm.org/buildbot/#/builders/68/builds/9681/steps/6/logs/stdio
---

diff --git a/lldb/source/Target/Target.cpp b/lldb/source/Target/Target.cpp
index 7c62904..3aa1d30 100644
--- a/lldb/source/Target/Target.cpp
+++ b/lldb/source/Target/Target.cpp
@@ -3092,7 +3092,7 @@ llvm::Expected<TraceSP &> Target::GetTraceOrCreate() {
       return llvm::createStringError(
           llvm::inconvertibleErrorCode(),
           "Couldn't start tracing the process. %s",
-          llvm::toString(trace_type.takeError()).c_str());
+          llvm::toString(trace_sp.takeError()).c_str());
   }
   return m_trace_sp;
 }
diff --git a/lldb/unittests/Process/gdb-remote/GDBRemoteCommunicationClientTest.cpp b/lldb/unittests/Process/gdb-remote/GDBRemoteCommunicationClientTest.cpp
index 0a9a42a..4eeec62 100644
--- a/lldb/unittests/Process/gdb-remote/GDBRemoteCommunicationClientTest.cpp
+++ b/lldb/unittests/Process/gdb-remote/GDBRemoteCommunicationClientTest.cpp
@@ -417,7 +417,7 @@ TEST_F(GDBRemoteCommunicationClientTest, SendTraceSupportedPacket) {
     HandlePacket(server, "jLLDBTraceSupported", R"({"type":"intel-pt"}])");
 
     EXPECT_FALSE(result.get());
-    ASSERT_STREQ(error_message.c_str(), "missing value at (root).description");
+    ASSERT_STREQ(error_message.c_str(), "missing value at TraceSupportedResponse.description");
   }
 
   // Error response