From ab50317e96e57dee5b3ff4ad3f16f205b2a3359e Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Wed, 24 Jan 2024 20:17:23 +0100 Subject: Merge llvm-project main llvmorg-18-init-18359-g93248729cfae This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvm-project main llvmorg-18-init-18359-g93248729cfae, the last commit before the upstream release/18.x branch was created. PR: 276104 MFC after: 1 month (cherry picked from commit 7a6dacaca14b62ca4b74406814becb87a3fefac0) --- contrib/llvm-project/lldb/source/Commands/CommandObjectSource.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'contrib/llvm-project/lldb/source/Commands/CommandObjectSource.cpp') diff --git a/contrib/llvm-project/lldb/source/Commands/CommandObjectSource.cpp b/contrib/llvm-project/lldb/source/Commands/CommandObjectSource.cpp index cabf6f0436f1..fde74f02aea6 100644 --- a/contrib/llvm-project/lldb/source/Commands/CommandObjectSource.cpp +++ b/contrib/llvm-project/lldb/source/Commands/CommandObjectSource.cpp @@ -747,13 +747,13 @@ protected: bool operator==(const SourceInfo &rhs) const { return function == rhs.function && - line_entry.original_file == rhs.line_entry.original_file && + *line_entry.original_file_sp == *rhs.line_entry.original_file_sp && line_entry.line == rhs.line_entry.line; } bool operator!=(const SourceInfo &rhs) const { return function != rhs.function || - line_entry.original_file != rhs.line_entry.original_file || + *line_entry.original_file_sp != *rhs.line_entry.original_file_sp || line_entry.line != rhs.line_entry.line; } -- cgit v1.2.3