Author: jmolenda
Date: Wed Jun 14 20:42:48 2017
New Revision: 305441

URL: http://llvm.org/viewvc/llvm-project?rev=305441&view=rev
Log:
Change how LocateDSYMInVincinityOfExecutable strips off path
components to not depend on "." characters in the fileanme
(e.g. "Foundation.framework") but instead to just use path
separators.  The names of the files themselves may have dots
in them ("com.apple.sbd") which would break the old scheme.

Also add a test case for this (macosx/find-dsym/bundle-with-dot-in-filename)
as well as a test case for r304520 (macosx/find-dsym/deep-bundle)
which needed a similar setup to test correctly on a single machine.
(both of these are really testing remote debug session situations
where the binary can't be found on the system where lldb is running,
complicating the test case a bit.)

<rdar://problem/31825940> 

Added:
    lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/
    
lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/bundle-with-dot-in-filename/
    
lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/bundle-with-dot-in-filename/Makefile
    
lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/bundle-with-dot-in-filename/TestBundleWithDotInFilename.py
    
lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/bundle-with-dot-in-filename/bundle.c
    
lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/bundle-with-dot-in-filename/main.c
    lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/
    
lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/Info.plist
    
lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/Makefile
    
lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/MyFramework.h
    
lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/TestDeepBundle.py
    
lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/main.c
    
lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/myframework.c
Modified:
    lldb/trunk/source/Host/common/Symbols.cpp

Added: 
lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/bundle-with-dot-in-filename/Makefile
URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/bundle-with-dot-in-filename/Makefile?rev=305441&view=auto
==============================================================================
--- 
lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/bundle-with-dot-in-filename/Makefile
 (added)
+++ 
lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/bundle-with-dot-in-filename/Makefile
 Wed Jun 14 20:42:48 2017
@@ -0,0 +1,21 @@
+CC ?= clang
+
+ifeq "$(ARCH)" ""
+       ARCH = x86_64
+endif
+
+CFLAGS ?= -g -O0 -arch $(ARCH)
+
+all: clean
+       $(CC) $(CFLAGS) -dynamiclib -o com.apple.sbd bundle.c
+       mkdir com.apple.sbd.xpc
+       mv com.apple.sbd com.apple.sbd.xpc/
+       mkdir -p com.apple.sbd.xpc.dSYM/Contents/Resources/DWARF
+       mv com.apple.sbd.dSYM/Contents/Resources/DWARF/com.apple.sbd 
com.apple.sbd.xpc.dSYM/Contents/Resources/DWARF/
+       rm -rf com.apple.sbd.dSYM
+       mkdir hide.app
+       tar cf - com.apple.sbd.xpc com.apple.sbd.xpc.dSYM | ( cd hide.app;tar 
xBpf -)
+       $(CC) $(CFLAGS) -o find-bundle-with-dots-in-fn main.c
+
+clean:
+       rm -rf a.out a.out.dSYM hide.app com.apple.sbd com.apple.sbd.dSYM 
com.apple.sbd.xpc com.apple.sbd.xpc.dSYM find-bundle-with-dots-in-fn 
find-bundle-with-dots-in-fn.dSYM

Added: 
lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/bundle-with-dot-in-filename/TestBundleWithDotInFilename.py
URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/bundle-with-dot-in-filename/TestBundleWithDotInFilename.py?rev=305441&view=auto
==============================================================================
--- 
lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/bundle-with-dot-in-filename/TestBundleWithDotInFilename.py
 (added)
+++ 
lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/bundle-with-dot-in-filename/TestBundleWithDotInFilename.py
 Wed Jun 14 20:42:48 2017
@@ -0,0 +1,71 @@
+"""Test that a dSYM can be found when a binary is in a bundle hnd has dots in 
the filename."""
+
+from __future__ import print_function
+
+#import unittest2
+import os.path
+from time import sleep
+
+import lldb
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
+from lldbsuite.test import lldbutil
+
+
+exe_name = 'find-bundle-with-dots-in-fn'  # must match Makefile
+
+class BundleWithDotInFilenameTestCase(TestBase):
+
+    mydir = TestBase.compute_mydir(__file__)
+
+    @skipIfRemote
+    @skipUnlessDarwin
+    # This test is explicitly a dSYM test, it doesn't need to run for any 
other config, but
+    # the following doesn't work, fixme.
+    # @skipIf(debug_info=no_match(["dsym"]), bugnumber="This test is looking 
explicitly for a dSYM")
+
+    def setUp(self):
+        TestBase.setUp(self)
+        self.source = 'main.c'
+
+    def tearDown(self):
+        # Destroy process before TestBase.tearDown()
+        self.dbg.GetSelectedTarget().GetProcess().Destroy()
+
+        # Call super's tearDown().
+        TestBase.tearDown(self)
+
+    def test_attach_and_check_dsyms(self):
+        """Test attach to binary, see if the bundle dSYM is found"""
+        exe = os.path.join(os.getcwd(), exe_name)
+        self.build()
+        popen = self.spawnSubprocess(exe)
+        self.addTearDownHook(self.cleanupSubprocesses)
+
+        # Give the inferior time to start up, dlopen a bundle, remove the 
bundle it linked in
+        sleep(5)
+
+        # Since the library that was dlopen()'ed is now removed, lldb will 
need to find the
+        # binary & dSYM via target.exec-search-paths 
+        settings_str = "settings set target.exec-search-paths " + 
self.get_process_working_directory() + "/hide.app"
+        self.runCmd(settings_str)
+
+        self.runCmd("process attach -p " + str(popen.pid))
+
+        target = self.dbg.GetSelectedTarget()
+        self.assertTrue(target.IsValid(), 'Should have a valid Target after 
attaching to process')
+
+        setup_complete = target.FindFirstGlobalVariable("setup_is_complete")
+        self.assertTrue(setup_complete.GetValueAsUnsigned() == 1, 'Check that 
inferior process has completed setup')
+
+        # Find the bundle module, see if we found the dSYM too (they're both 
in "hide.app")
+        i = 0
+        while i < target.GetNumModules():
+            mod = target.GetModuleAtIndex(i)
+            if mod.GetFileSpec().GetFilename() == 'com.apple.sbd':
+                dsym_name = mod.GetSymbolFileSpec().GetFilename()
+                self.assertTrue (dsym_name == 'com.apple.sbd', "Check that we 
found the dSYM for the bundle that was loaded")
+            i=i+1
+
+if __name__ == '__main__':
+    unittest.main()

Added: 
lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/bundle-with-dot-in-filename/bundle.c
URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/bundle-with-dot-in-filename/bundle.c?rev=305441&view=auto
==============================================================================
--- 
lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/bundle-with-dot-in-filename/bundle.c
 (added)
+++ 
lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/bundle-with-dot-in-filename/bundle.c
 Wed Jun 14 20:42:48 2017
@@ -0,0 +1,4 @@
+int foo ()
+{
+    return 5;
+}

Added: 
lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/bundle-with-dot-in-filename/main.c
URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/bundle-with-dot-in-filename/main.c?rev=305441&view=auto
==============================================================================
--- 
lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/bundle-with-dot-in-filename/main.c
 (added)
+++ 
lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/bundle-with-dot-in-filename/main.c
 Wed Jun 14 20:42:48 2017
@@ -0,0 +1,28 @@
+#include <dlfcn.h>
+#include <unistd.h>
+#include <stdlib.h>
+
+int setup_is_complete = 0;
+
+int main()
+{
+
+    void *handle = dlopen ("com.apple.sbd.xpc/com.apple.sbd", RTLD_NOW);
+    if (handle)
+    {
+        if (dlsym(handle, "foo"))
+        {
+            system ("/bin/rm -rf com.apple.sbd.xpc com.apple.sbd.xpc.dSYM");
+            setup_is_complete = 1;
+
+            // At this point we want lldb to attach to the process.  If lldb 
attaches
+            // before we've removed the dlopen'ed bundle, lldb will find the 
bundle
+            // at its actual filepath and not have to do any tricky work, 
invalidating
+            // the test.
+
+            for (int loop_limiter = 0; loop_limiter < 100; loop_limiter++)
+                sleep (1);
+        }
+    }
+    return 0;
+}

Added: 
lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/Info.plist
URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/Info.plist?rev=305441&view=auto
==============================================================================
--- 
lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/Info.plist
 (added)
+++ 
lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/Info.plist
 Wed Jun 14 20:42:48 2017
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" 
"http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+<dict>
+       <key>BuildMachineOSBuild</key>
+       <string>16B2657</string>
+       <key>CFBundleDevelopmentRegion</key>
+       <string>en</string>
+       <key>CFBundleExecutable</key>
+       <string>MyFramework</string>
+       <key>CFBundleIdentifier</key>
+       <string>com.apple.test.framework</string>
+       <key>CFBundleInfoDictionaryVersion</key>
+       <string>6.0</string>
+       <key>CFBundleName</key>
+       <string>MyFramework</string>
+       <key>CFBundlePackageType</key>
+       <string>FMWK</string>
+       <key>CFBundleShortVersionString</key>
+       <string>113</string>
+       <key>CFBundleSignature</key>
+       <string>????</string>
+       <key>CFBundleSupportedPlatforms</key>
+       <array>
+               <string>MacOSX</string>
+       </array>
+       <key>CFBundleVersion</key>
+       <string>113</string>
+       <key>DTCompiler</key>
+       <string>com.apple.compilers.llvm.clang.1_0</string>
+       <key>DTPlatformBuild</key>
+       <string>9L120i</string>
+       <key>DTPlatformVersion</key>
+       <string>GM</string>
+       <key>DTSDKBuild</key>
+       <string>17A261x</string>
+       <key>DTSDKName</key>
+       <string>macosx10.13</string>
+       <key>DTXcode</key>
+       <string>0900</string>
+       <key>DTXcodeBuild</key>
+       <string>9L120i</string>
+</dict>
+</plist>

Added: 
lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/Makefile
URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/Makefile?rev=305441&view=auto
==============================================================================
--- 
lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/Makefile 
(added)
+++ 
lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/Makefile 
Wed Jun 14 20:42:48 2017
@@ -0,0 +1,28 @@
+CC ?= clang
+
+ifeq "$(ARCH)" ""
+       ARCH = x86_64
+endif
+
+CFLAGS ?= -g -O0 -arch $(ARCH)
+
+all: clean
+       $(CC) $(CFLAGS) -install_name 
$(PWD)/MyFramework.framework/Versions/A/MyFramework -dynamiclib -o MyFramework 
myframework.c
+       mkdir -p MyFramework.framework/Versions/A/Headers
+       mkdir -p MyFramework.framework/Versions/A/Resources
+       cp MyFramework MyFramework.framework/Versions/A
+       cp MyFramework.h MyFramework.framework/Versions/A/Headers
+       cp Info.plist MyFramework.framework/Versions/A/Resources
+       ( cd MyFramework.framework/Versions ; ln -s A Current )
+       ( cd MyFramework.framework/ ; ln -s Versions/Current/Headers . )
+       ( cd MyFramework.framework/ ; ln -s Versions/Current/MyFramework . )
+       ( cd MyFramework.framework/ ; ln -s Versions/Current/Resources . )
+       mv MyFramework.dSYM MyFramework.framework.dSYM
+       mkdir hide.app
+       rm -f MyFramework
+       tar cf - MyFramework.framework MyFramework.framework.dSYM | ( cd 
hide.app;tar xBpf -)
+       $(CC) $(CFLAGS) -o deep-bundle main.c -F. -framework MyFramework
+       
+
+clean:
+       rm -rf a.out a.out.dSYM deep-bundle deep-bundle.dSYM 
MyFramework.framework MyFramework.framework.dSYM MyFramework MyFramework.dSYM 
hide.app

Added: 
lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/MyFramework.h
URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/MyFramework.h?rev=305441&view=auto
==============================================================================
--- 
lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/MyFramework.h
 (added)
+++ 
lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/MyFramework.h
 Wed Jun 14 20:42:48 2017
@@ -0,0 +1 @@
+int foo ();

Added: 
lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/TestDeepBundle.py
URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/TestDeepBundle.py?rev=305441&view=auto
==============================================================================
--- 
lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/TestDeepBundle.py
 (added)
+++ 
lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/TestDeepBundle.py
 Wed Jun 14 20:42:48 2017
@@ -0,0 +1,75 @@
+"""Test that a dSYM can be found when a binary is in a deep bundle with 
multiple pathname components."""
+
+from __future__ import print_function
+
+#import unittest2
+import os.path
+from time import sleep
+
+import lldb
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
+from lldbsuite.test import lldbutil
+
+
+exe_name = 'deep-bundle'  # must match Makefile
+
+class DeepBundleTestCase(TestBase):
+
+    mydir = TestBase.compute_mydir(__file__)
+
+    @skipIfRemote
+    @skipUnlessDarwin
+    # This test is explicitly a dSYM test, it doesn't need to run for any 
other config, but
+    # the following doesn't work, fixme.
+    # @skipIf(debug_info=no_match(["dsym"]), bugnumber="This test is looking 
explicitly for a dSYM")
+
+    def setUp(self):
+        TestBase.setUp(self)
+        self.source = 'main.c'
+
+    def tearDown(self):
+        # Destroy process before TestBase.tearDown()
+        self.dbg.GetSelectedTarget().GetProcess().Destroy()
+
+        # Call super's tearDown().
+        TestBase.tearDown(self)
+
+    def test_attach_and_check_dsyms(self):
+        """Test attach to binary, see if the framework dSYM is found"""
+        exe = os.path.join(os.getcwd(), exe_name)
+        self.build()
+        popen = self.spawnSubprocess(exe)
+        self.addTearDownHook(self.cleanupSubprocesses)
+
+        # Give the inferior time to start up, dlopen a bundle, remove the 
bundle it linked in
+        sleep(5)
+
+        # Since the library that was dlopen()'ed is now removed, lldb will 
need to find the
+        # binary & dSYM via target.exec-search-paths 
+        settings_str = "settings set target.exec-search-paths " + 
self.get_process_working_directory() + "/hide.app"
+        self.runCmd(settings_str)
+
+        self.runCmd("process attach -p " + str(popen.pid))
+
+        target = self.dbg.GetSelectedTarget()
+        self.assertTrue(target.IsValid(), 'Should have a valid Target after 
attaching to process')
+
+        setup_complete = target.FindFirstGlobalVariable("setup_is_complete")
+        self.assertTrue(setup_complete.GetValueAsUnsigned() == 1, 'Check that 
inferior process has completed setup')
+
+        # Find the bundle module, see if we found the dSYM too (they're both 
in "hide.app")
+        i = 0
+        found_module = False
+        while i < target.GetNumModules():
+            mod = target.GetModuleAtIndex(i)
+            if mod.GetFileSpec().GetFilename() == 'MyFramework':
+                found_module = True
+                dsym_name = mod.GetSymbolFileSpec().GetFilename()
+                self.assertTrue (dsym_name == 'MyFramework', "Check that we 
found the dSYM for the bundle that was loaded")
+            i=i+1
+         
+        self.assertTrue(found_module, "Check that we found the framework 
loaded in lldb's image list")
+
+if __name__ == '__main__':
+    unittest.main()

Added: 
lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/main.c
URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/main.c?rev=305441&view=auto
==============================================================================
--- 
lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/main.c 
(added)
+++ 
lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/main.c 
Wed Jun 14 20:42:48 2017
@@ -0,0 +1,22 @@
+#include <MyFramework/MyFramework.h>
+#include <unistd.h>
+#include <stdlib.h>
+
+int setup_is_complete = 0;
+
+int main()
+{
+    system ("/bin/rm -rf MyFramework MyFramework.framework 
MyFramework.framework.dSYM");
+
+    setup_is_complete = 1;
+
+    // At this point we want lldb to attach to the process.  If lldb attaches
+    // before we've removed the framework we're running against, it will be
+    // easy for lldb to find the binary & dSYM without using 
target.exec-search-paths,
+    // which is the point of this test.
+
+    for (int loop_limiter = 0; loop_limiter < 100; loop_limiter++)
+        sleep (1);
+
+     return foo();
+}

Added: 
lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/myframework.c
URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/myframework.c?rev=305441&view=auto
==============================================================================
--- 
lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/myframework.c
 (added)
+++ 
lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/myframework.c
 Wed Jun 14 20:42:48 2017
@@ -0,0 +1,4 @@
+int foo ()
+{
+    return 5;
+}

Modified: lldb/trunk/source/Host/common/Symbols.cpp
URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/common/Symbols.cpp?rev=305441&r1=305440&r2=305441&view=diff
==============================================================================
--- lldb/trunk/source/Host/common/Symbols.cpp (original)
+++ lldb/trunk/source/Host/common/Symbols.cpp Wed Jun 14 20:42:48 2017
@@ -86,7 +86,6 @@ static bool LocateDSYMInVincinityOfExecu
                         path);
           }
         }
-        size_t obj_file_path_length = strlen(path);
         ::strncat(path, ".dSYM/Contents/Resources/DWARF/",
                   sizeof(path) - strlen(path) - 1);
         ::strncat(path, exec_fspec->GetFilename().AsCString(),
@@ -105,38 +104,41 @@ static bool LocateDSYMInVincinityOfExecu
           }
           return true;
         } else {
-          path[obj_file_path_length] = '\0';
+          // Get a clean copy of the executable path, without the final 
filename
+          FileSpec path_dir_fspec (exec_fspec->GetDirectory().AsCString(), 
true);
+          std::string path_dir_str = path_dir_fspec.GetPath();
 
-          char *last_dot = strrchr(path, '.');
-          while (last_dot != NULL && last_dot[0]) {
-            char *next_slash = strchr(last_dot, '/');
-            if (next_slash != NULL) {
-              *next_slash = '\0';
-              ::strncat(path, ".dSYM/Contents/Resources/DWARF/",
-                        sizeof(path) - strlen(path) - 1);
-              ::strncat(path, exec_fspec->GetFilename().AsCString(),
-                        sizeof(path) - strlen(path) - 1);
-              dsym_fspec.SetFile(path, false);
-              if (dsym_fspec.Exists() &&
-                  FileAtPathContainsArchAndUUID(
-                      dsym_fspec, module_spec.GetArchitecturePtr(),
-                      module_spec.GetUUIDPtr())) {
-                if (log) {
-                  log->Printf("dSYM with matching UUID & arch found at %s",
-                              path);
-                }
-                return true;
-              } else {
-                *last_dot = '\0';
-                char *prev_slash = strrchr(path, '/');
-                if (prev_slash != NULL)
-                  *prev_slash = '\0';
-                else
-                  break;
-              }
-            } else {
-              break;
+          // Add a ".dSYM" name to each directory component of the path, 
stripping
+          // off components.  e.g. we may have a binary like
+          // /S/L/F/Foundation.framework/Versions/A/Foundation
+          // and
+          // /S/L/F/Foundation.framework.dSYM
+          //
+          // so we'll need to start with 
/S/L/F/Foundation.framework/Versions/A,
+          // add the .dSYM part to the "A", and if that doesn't exist, strip 
off
+          // the "A" and try it again with "Versions", etc., until we find a 
dSYM
+          // bundle or we've stripped off enough path components that there's 
no
+          // need to continue.
+
+          for (int i = 0; i < 4; i++) {
+            std::string path_dir_plus_dsym (path_dir_str);
+            path_dir_plus_dsym += ".dSYM/Contents/Resources/DWARF/";
+            path_dir_plus_dsym += exec_fspec->GetFilename().AsCString();
+            dsym_fspec.SetFile (path_dir_plus_dsym, true);
+            if (dsym_fspec.Exists() &&
+                    FileAtPathContainsArchAndUUID(
+                        dsym_fspec, module_spec.GetArchitecturePtr(),
+                        module_spec.GetUUIDPtr())) {
+                  if (log) {
+                    log->Printf("dSYM with matching UUID & arch found at %s",
+                                path_dir_plus_dsym.c_str());
+                  }
+                  return true;
             }
+            auto const last_slash = path_dir_str.rfind('/');
+            if (last_slash == std::string::npos)
+                break;
+            path_dir_str.resize(last_slash);
           }
         }
       }


_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits

Reply via email to