Fix the ThreadSanitizer support to avoid creating empty SBThreads and to not crash...

llvm-svn: 264854

diff --git a/lldb/source/API/SBThread.cpp b/lldb/source/API/SBThread.cpp
index e954781..015a42d 100644 (file)
--- a/lldb/source/API/SBThread.cpp
+++ b/lldb/source/API/SBThread.cpp
@@ -338,8 +338,12 @@ AddThreadsForPath(std::string path, ThreadCollectionSP threads, ProcessSP proces
             pcs.push_back(pc->GetAsInteger()->GetValue());
             return true;
         });
+
+        if (pcs.size() == 0)
+            return true;
         
-        tid_t tid = o->GetObjectForDotSeparatedPath("thread_id")->GetIntegerValue();
+        StructuredData::ObjectSP thread_id_obj = o->GetObjectForDotSeparatedPath("thread_id");
+        tid_t tid = thread_id_obj ? thread_id_obj->GetIntegerValue() : 0;
         uint32_t stop_id = 0;
         bool stop_id_is_valid = false;
         HistoryThread *history_thread = new HistoryThread(*process_sp, tid, pcs, stop_id, stop_id_is_valid);

diff --git a/lldb/source/Plugins/InstrumentationRuntime/ThreadSanitizer/ThreadSanitizerRuntime.cpp b/lldb/source/Plugins/InstrumentationRuntime/ThreadSanitizer/ThreadSanitizerRuntime.cpp
index cc016ea..63b4b00 100644 (file)
--- a/lldb/source/Plugins/InstrumentationRuntime/ThreadSanitizer/ThreadSanitizerRuntime.cpp
+++ b/lldb/source/Plugins/InstrumentationRuntime/ThreadSanitizer/ThreadSanitizerRuntime.cpp
@@ -259,7 +259,7 @@ for (int i = 0; i < t.thread_count; i++) {
     __tsan_get_report_thread(t.report, i, &t.threads[i].tid, &t.threads[i].pid, &t.threads[i].running, &t.threads[i].name, &t.threads[i].parent_tid, t.threads[i].trace, REPORT_TRACE_SIZE);
 }
 
-if (t.unique_tid_count > REPORT_ARRAY_SIZE) t.unique_tid_count = REPORT_ARRAY_SIZE;
+if (t.unique_tid_count > REPORT_ARRAY_SIZE) t.unique_tid_count = REPORT_ARRAY_SIZE;
 for (int i = 0; i < t.unique_tid_count; i++) {
     t.unique_tids[i].idx = i;
     __tsan_get_report_unique_tid(t.report, i, &t.unique_tids[i].tid);