Merge commit 'a37cb5ece513' from llvm.org/main into next

git apple-llvm automerger · git apple-llvm automerger · commit c703152f24f1 · 2022-03-31T00:10:05.000+03:00
diff --git a/lldb/tools/lldb-vscode/lldb-vscode.cpp b/lldb/tools/lldb-vscode/lldb-vscode.cpp
@@ -3246,7 +3246,6 @@ int main(int argc, char *argv[]) {
     g_vsc.output.descriptor = StreamDescriptor::from_file(new_stdout_fd, false);
   }
 
-  uint32_t packet_idx = 0;
   while (!g_vsc.sent_terminated_event) {
     llvm::json::Object object;
     lldb_vscode::PacketStatus status = g_vsc.GetNextObject(object);
@@ -3257,7 +3256,6 @@ int main(int argc, char *argv[]) {
 
     if (!g_vsc.HandleObject(object))
       return 1;
-    ++packet_idx;
   }
 
   return EXIT_SUCCESS;

Original file line number	Diff line number	Diff line change
`@@ -3246,7 +3246,6 @@ int main(int argc, char *argv[]) {`
`3246`	`3246`	`g_vsc.output.descriptor = StreamDescriptor::from_file(new_stdout_fd, false);`
`3247`	`3247`	`}`
`3248`	`3248`
`3249`		`- uint32_t packet_idx = 0;`
`3250`	`3249`	`while (!g_vsc.sent_terminated_event) {`
`3251`	`3250`	`llvm::json::Object object;`
`3252`	`3251`	`lldb_vscode::PacketStatus status = g_vsc.GetNextObject(object);`
`@@ -3257,7 +3256,6 @@ int main(int argc, char *argv[]) {`
`3257`	`3256`
`3258`	`3257`	`if (!g_vsc.HandleObject(object))`
`3259`	`3258`	`return 1;`
`3260`		`- ++packet_idx;`
`3261`	`3259`	`}`
`3262`	`3260`
`3263`	`3261`	`return EXIT_SUCCESS;`