Merge pull request #254 from Teemperor/RevertNFCCheckThreadPlanStepInRangeMaster

[upstreaming] Revert changes to ThreadPlanStepInRange::FrameMatchesAv…

Author: Teemperor

lldb/source/Target/ThreadPlanStepInRange.cpp

@@ -408,18 +408,21 @@ bool ThreadPlanStepInRange::FrameMatchesAvoidCriteria() {
   StackFrame *frame = GetThread().GetStackFrameAtIndex(0).get();
 
   // Check the library list first, as that's cheapest:
+  bool libraries_say_avoid = false;
+
   FileSpecList libraries_to_avoid(GetThread().GetLibrariesToAvoid());
   size_t num_libraries = libraries_to_avoid.GetSize();
-  bool libraries_say_avoid = false;
-  SymbolContext sc(frame->GetSymbolContext(eSymbolContextModule));
-  FileSpec frame_library(sc.module_sp->GetFileSpec());
-
-  if (frame_library) {
-    for (size_t i = 0; i < num_libraries; i++) {
-      const FileSpec &file_spec(libraries_to_avoid.GetFileSpecAtIndex(i));
-      if (FileSpec::Equal(file_spec, frame_library, false)) {
-        libraries_say_avoid = true;
-        break;
+  if (num_libraries > 0) {
+    SymbolContext sc(frame->GetSymbolContext(eSymbolContextModule));
+    FileSpec frame_library(sc.module_sp->GetFileSpec());
+
+    if (frame_library) {
+      for (size_t i = 0; i < num_libraries; i++) {
+        const FileSpec &file_spec(libraries_to_avoid.GetFileSpecAtIndex(i));
+        if (FileSpec::Equal(file_spec, frame_library, false)) {
+          libraries_say_avoid = true;
+          break;
+        }
       }
     }
   }