[Lldb-commits] [lldb] 48677f5 - [lldb] Unbreak the macOS build after dfd499a61c45778b7f01458d50ccc384343f53d5

[Raphael Isemann via lldb-commits]

Thanks!

Am Di., 2. Nov. 2021 um 09:48 Uhr schrieb Benjamin Kramer via
lldb-commits <lldb-commits at lists.llvm.org>:
>
>
> Author: Benjamin Kramer
> Date: 2021-11-02T09:47:44+01:00
> New Revision: 48677f58b06cfb8715902173c5bc3d1764d7c8c6
>
> URL: https://github.com/llvm/llvm-project/commit/48677f58b06cfb8715902173c5bc3d1764d7c8c6
> DIFF: https://github.com/llvm/llvm-project/commit/48677f58b06cfb8715902173c5bc3d1764d7c8c6.diff
>
> LOG: [lldb] Unbreak the macOS build after dfd499a61c45778b7f01458d50ccc384343f53d5
>
> Added:
>
>
> Modified:
>     lldb/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.cpp
>     lldb/source/Symbol/LocateSymbolFileMacOSX.cpp
>
> Removed:
>
>
>
> ################################################################################
> diff  --git a/lldb/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.cpp b/lldb/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.cpp
> index 6e97f3d440f3f..d9f4174b19a3c 100644
> --- a/lldb/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.cpp
> +++ b/lldb/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.cpp
> @@ -239,7 +239,7 @@ SymbolVendorMacOSX::CreateInstance(const lldb::ModuleSP &module_sp,
>                                  DBGSourcePath = resolved_source_path.GetPath();
>                                }
>                                module_sp->GetSourceMappingList().Append(
> -                                  key, ConstString(DBGSourcePath), true);
> +                                  key.GetStringRef(), DBGSourcePath, true);
>                                // With version 2 of DBGSourcePathRemapping, we
>                                // can chop off the last two filename parts
>                                // from the source remapping and get a more
> @@ -254,8 +254,7 @@ SymbolVendorMacOSX::CreateInstance(const lldb::ModuleSP &module_sp,
>                                  source_path.RemoveLastPathComponent();
>                                  source_path.RemoveLastPathComponent();
>                                  module_sp->GetSourceMappingList().Append(
> -                                    ConstString(build_path.GetPath().c_str()),
> -                                    ConstString(source_path.GetPath().c_str()),
> +                                    build_path.GetPath(), source_path.GetPath(),
>                                      true);
>                                }
>                              }
> @@ -276,8 +275,7 @@ SymbolVendorMacOSX::CreateInstance(const lldb::ModuleSP &module_sp,
>                          DBGSourcePath = resolved_source_path.GetPath();
>                        }
>                        module_sp->GetSourceMappingList().Append(
> -                          ConstString(DBGBuildSourcePath),
> -                          ConstString(DBGSourcePath), true);
> +                          DBGBuildSourcePath, DBGSourcePath, true);
>                      }
>                    }
>                  }
>
> diff  --git a/lldb/source/Symbol/LocateSymbolFileMacOSX.cpp b/lldb/source/Symbol/LocateSymbolFileMacOSX.cpp
> index 2655e4de9063a..a13b4a7a54f2c 100644
> --- a/lldb/source/Symbol/LocateSymbolFileMacOSX.cpp
> +++ b/lldb/source/Symbol/LocateSymbolFileMacOSX.cpp
> @@ -414,9 +414,8 @@ static bool GetModuleSpecInfoFromUUIDDictionary(CFDictionaryRef uuid_dict,
>              // last two filename parts from the source remapping and get a more
>              // general source remapping that still works. Add this as another
>              // option in addition to the full source path remap.
> -            module_spec.GetSourceMappingList().Append(
> -                ConstString(DBGBuildSourcePath.c_str()),
> -                ConstString(DBGSourcePath.c_str()), true);
> +            module_spec.GetSourceMappingList().Append(DBGBuildSourcePath,
> +                                                      DBGSourcePath, true);
>              if (do_truncate_remapping_names) {
>                FileSpec build_path(DBGBuildSourcePath.c_str());
>                FileSpec source_path(DBGSourcePath.c_str());
> @@ -425,8 +424,7 @@ static bool GetModuleSpecInfoFromUUIDDictionary(CFDictionaryRef uuid_dict,
>                source_path.RemoveLastPathComponent();
>                source_path.RemoveLastPathComponent();
>                module_spec.GetSourceMappingList().Append(
> -                  ConstString(build_path.GetPath().c_str()),
> -                  ConstString(source_path.GetPath().c_str()), true);
> +                  build_path.GetPath(), source_path.GetPath(), true);
>              }
>            }
>          }
> @@ -458,9 +456,8 @@ static bool GetModuleSpecInfoFromUUIDDictionary(CFDictionaryRef uuid_dict,
>          FileSystem::Instance().Resolve(resolved_source_path);
>          DBGSourcePath = resolved_source_path.GetPath();
>        }
> -      module_spec.GetSourceMappingList().Append(
> -          ConstString(DBGBuildSourcePath.c_str()),
> -          ConstString(DBGSourcePath.c_str()), true);
> +      module_spec.GetSourceMappingList().Append(DBGBuildSourcePath,
> +                                                DBGSourcePath, true);
>      }
>    }
>    return success;
>
>
>
> _______________________________________________
> lldb-commits mailing list
> lldb-commits at lists.llvm.org
> https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits