zturner created this revision.
zturner added a reviewer: clayborg.
I tried installing this, and I couldn't get it working. VS Code would launch
the adapter and then it would get stuck waiting for something to happen.
Eventually, I tracked this down to the fact that it couldn't locate
lldb-server, and I fixed this by symlinking lldb-server in the extension's bin
directory. However, it would have saved me a lot of time if VS Code had told
me about this. So then I started investigating why it didn't tell me about
this, and it turns out that the reason is that in `FillResponse` we initialize
the `success` field to `true`, and then when an error occurs, we use
`try_emplace` to set it to `false`. However, the semantics of this function
are that if the value is already set, don't do anything, so ultimately this
resulted in us sending back a response message saying we had succeeded even
though we had failed. So VS Code would think that we were fine and was just
waiting on us to launch the process, even though we couldn't.
So, for the failure case, we shouldn't be using `try_emplace`, we should just
clobber the old value. After this, I've confirmed that if lldb-server is
missing, VS Code reports an appropriate error message to me.
https://reviews.llvm.org/D59043
Files:
lldb/tools/lldb-vscode/lldb-vscode.cpp
Index: lldb/tools/lldb-vscode/lldb-vscode.cpp
===================================================================
--- lldb/tools/lldb-vscode/lldb-vscode.cpp
+++ lldb/tools/lldb-vscode/lldb-vscode.cpp
@@ -537,7 +537,7 @@
const char *symfile = nullptr;
g_vsc.target.AddModule(program.data(), target_triple, uuid_cstr, symfile);
if (error.Fail()) {
- response.try_emplace("success", false);
+ response["success"] = llvm::json::Value(false);
EmplaceSafeString(response, "message", std::string(error.GetCString()));
g_vsc.SendJSON(llvm::json::Value(std::move(response)));
return;
@@ -589,7 +589,7 @@
}
if (error.Fail()) {
- response.try_emplace("success", false);
+ response["success"] = llvm::json::Value(false);
EmplaceSafeString(response, "message", std::string(error.GetCString()));
}
g_vsc.SendJSON(llvm::json::Value(std::move(response)));
@@ -832,7 +832,7 @@
// uint64_t exc_data = thread.GetStopReasonDataAtIndex(i);
// }
} else {
- response.try_emplace("success", false);
+ response["success"] = llvm::json::Value(false);
}
response.try_emplace("body", std::move(body));
g_vsc.SendJSON(llvm::json::Value(std::move(response)));
@@ -964,7 +964,7 @@
if (value.GetError().Fail())
value = frame.EvaluateExpression(expression.data());
if (value.GetError().Fail()) {
- response.try_emplace("success", false);
+ response["success"] = llvm::json::Value(false);
const char *error_cstr = value.GetError().GetCString();
if (error_cstr && error_cstr[0])
EmplaceSafeString(response, "message", std::string(error_cstr));
@@ -1239,7 +1239,7 @@
const char *symfile = nullptr;
g_vsc.target.AddModule(program.data(), target_triple, uuid_cstr, symfile);
if (error.Fail()) {
- response.try_emplace("success", false);
+ response["success"] = llvm::json::Value(false);
EmplaceSafeString(response, "message", std::string(error.GetCString()));
g_vsc.SendJSON(llvm::json::Value(std::move(response)));
}
@@ -1277,7 +1277,7 @@
g_vsc.debugger.SetAsync(false);
g_vsc.target.Launch(g_vsc.launch_info, error);
if (error.Fail()) {
- response.try_emplace("success", false);
+ response["success"] = llvm::json::Value(false);
EmplaceSafeString(response, "message", std::string(error.GetCString()));
}
g_vsc.SendJSON(llvm::json::Value(std::move(response)));
@@ -1339,7 +1339,7 @@
g_vsc.focus_tid = thread.GetThreadID();
thread.StepOver();
} else {
- response.try_emplace("success", false);
+ response["success"] = llvm::json::Value(false);
}
g_vsc.SendJSON(llvm::json::Value(std::move(response)));
}
@@ -1946,7 +1946,7 @@
if (pos != g_vsc.source_map.end()) {
EmplaceSafeString(body, "content", pos->second.content);
} else {
- response.try_emplace("success", false);
+ response["success"] = llvm::json::Value(false);
}
response.try_emplace("body", std::move(body));
g_vsc.SendJSON(llvm::json::Value(std::move(response)));
@@ -2107,7 +2107,7 @@
g_vsc.focus_tid = thread.GetThreadID();
thread.StepInto();
} else {
- response.try_emplace("success", false);
+ response["success"] = llvm::json::Value(false);
}
g_vsc.SendJSON(llvm::json::Value(std::move(response)));
}
@@ -2161,7 +2161,7 @@
g_vsc.focus_tid = thread.GetThreadID();
thread.StepOut();
} else {
- response.try_emplace("success", false);
+ response["success"] = llvm::json::Value(false);
}
g_vsc.SendJSON(llvm::json::Value(std::move(response)));
}
@@ -2216,7 +2216,7 @@
threads.emplace_back(CreateThread(thread));
}
if (threads.size() == 0) {
- response.try_emplace("success", false);
+ response["success"] = llvm::json::Value(false);
}
llvm::json::Object body;
body.try_emplace("threads", std::move(threads));
@@ -2410,7 +2410,7 @@
} else {
EmplaceSafeString(body, "message", std::string(error.GetCString()));
}
- response.try_emplace("success", success);
+ response["success"] = llvm::json::Value(success);
}
response.try_emplace("body", std::move(body));
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
