1 files changed, 17 insertions, 48 deletions

diff --git a/source/Plugins/SymbolFile/DWARF/DWARFDebugLine.cpp b/source/Plugins/SymbolFile/DWARF/DWARFDebugLine.cpp
index 11589ae..48e11bd 100644
--- a/source/Plugins/SymbolFile/DWARF/DWARFDebugLine.cpp
+++ b/source/Plugins/SymbolFile/DWARF/DWARFDebugLine.cpp
@@ -488,7 +488,6 @@ DWARFDebugLine::ParseSupportFiles (const lldb::ModuleSP &module_sp,
     lldb::offset_t offset = stmt_list;
     // Skip the total length
     (void)debug_line_data.GetDWARFInitialLength(&offset);
-    const char * s;
     uint32_t version = debug_line_data.GetU16(&offset);
     if (version < 2 || version > 4)
       return false;
@@ -502,68 +501,38 @@ DWARFDebugLine::ParseSupportFiles (const lldb::ModuleSP &module_sp,
     // Skip opcode base, and all opcode lengths
     const uint8_t opcode_base = debug_line_data.GetU8(&offset);
     offset += opcode_base - 1;
-    std::vector<std::string> include_directories;
-    include_directories.push_back("");  // Directory at index zero doesn't exist
+    std::vector<FileSpec> include_directories{{}}; // Directory at index zero doesn't exist
     while (offset < end_prologue_offset)
     {
-        s = debug_line_data.GetCStr(&offset);
-        if (s && s[0])
-            include_directories.push_back(s);
+        FileSpec dir{debug_line_data.GetCStr(&offset), false};
+        if (dir)
+            include_directories.emplace_back(std::move(dir));
         else
             break;
     }
-    std::string fullpath;
-    std::string remapped_fullpath;
     while (offset < end_prologue_offset)
     {
-        const char* path = debug_line_data.GetCStr( &offset );
-        if (path && path[0])
+        FileSpec file_spec{debug_line_data.GetCStr(&offset), false};
+        if (file_spec)
         {
-            uint32_t dir_idx    = debug_line_data.GetULEB128( &offset );
+            uint32_t dir_idx = debug_line_data.GetULEB128(&offset);
             debug_line_data.Skip_LEB128(&offset); // Skip mod_time
             debug_line_data.Skip_LEB128(&offset); // Skip length
 
-            if (path[0] == '/')
-            {
-                // The path starts with a directory delimiter, so we are done.
-                if (module_sp->RemapSourceFile (path, fullpath))
-                    support_files.Append(FileSpec (fullpath.c_str(), false));
-                else
-                    support_files.Append(FileSpec (path, false));
-            }
-            else
+            if (file_spec.IsRelative())
             {
-                if (dir_idx > 0 && dir_idx < include_directories.size())
-                {
-                    if (cu_comp_dir && include_directories[dir_idx][0] != '/')
-                    {
-                        fullpath = cu_comp_dir;
-
-                        if (*fullpath.rbegin() != '/')
-                            fullpath += '/';
-                        fullpath += include_directories[dir_idx];
-
-                    }
-                    else
-                        fullpath = include_directories[dir_idx];
-                }
-                else if (cu_comp_dir && cu_comp_dir[0])
+                if (0 < dir_idx && dir_idx < include_directories.size())
                 {
-                    fullpath = cu_comp_dir;
+                    const FileSpec &dir = include_directories[dir_idx];
+                    file_spec.PrependPathComponent(dir);
                 }
-
-                if (!fullpath.empty())
-                {
-                   if (*fullpath.rbegin() != '/')
-                        fullpath += '/';
-                }
-                fullpath += path;
-                if (module_sp->RemapSourceFile (fullpath.c_str(), remapped_fullpath))
-                    support_files.Append(FileSpec (remapped_fullpath.c_str(), false));
-                else
-                    support_files.Append(FileSpec (fullpath.c_str(), false));
+                if (file_spec.IsRelative())
+                    file_spec.PrependPathComponent(cu_comp_dir);
             }
-            
+            std::string remapped_file;
+            if (module_sp->RemapSourceFile(file_spec.GetCString(), remapped_file))
+                file_spec.SetFile(remapped_file, false);
+            support_files.Append(file_spec);
         }
     }