From 01ee1789d6aa7294e5966a97f8d29387f6f81699 Mon Sep 17 00:00:00 2001 From: emaste Date: Tue, 25 Nov 2014 21:00:58 +0000 Subject: Import LLDB as of upstream SVN r216948 (git 50f7fe44) This corresponds with the branchpoint for the 3.5 release. A number of files not required for the FreeBSD build have been removed. Sponsored by: DARPA, AFRL --- include/lldb/Core/ModuleSpec.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/lldb/Core/ModuleSpec.h') diff --git a/include/lldb/Core/ModuleSpec.h b/include/lldb/Core/ModuleSpec.h index dfeb7b7..195fd99 100644 --- a/include/lldb/Core/ModuleSpec.h +++ b/include/lldb/Core/ModuleSpec.h @@ -370,7 +370,6 @@ public: if (dumped_something) strm.PutCString(", "); strm.Printf("object_mod_time = 0x%" PRIx64, m_object_mod_time.GetAsSecondsSinceJan1_1970()); - dumped_something = true; } } @@ -387,14 +386,15 @@ public: if (!FileSpec::Equal(fspec, GetFileSpec(), fspec.GetDirectory().IsEmpty() == false)) return false; } - if (match_module_spec.GetPlatformFileSpecPtr()) + if (GetPlatformFileSpec() && match_module_spec.GetPlatformFileSpecPtr()) { const FileSpec &fspec = match_module_spec.GetPlatformFileSpec(); if (!FileSpec::Equal(fspec, GetPlatformFileSpec(), fspec.GetDirectory().IsEmpty() == false)) return false; } - if (match_module_spec.GetSymbolFileSpecPtr()) + // Only match the symbol file spec if there is one in this ModuleSpec + if (GetSymbolFileSpec() && match_module_spec.GetSymbolFileSpecPtr()) { const FileSpec &fspec = match_module_spec.GetSymbolFileSpec(); if (!FileSpec::Equal(fspec, GetSymbolFileSpec(), fspec.GetDirectory().IsEmpty() == false)) -- cgit v1.1