Add a full parameter to Declaration::Equals since different code

paths need different behaviors.

Author: jimingham

lldb/include/lldb/Core/Declaration.h

@@ -83,11 +83,15 @@ class Declaration {
   ///
   /// \param[in] declaration
   ///     The const Declaration object to compare with.
+  ///     
+  /// \param[in] full
+  ///     Same meaning as Full in FileSpec::Equal.  True means an empty 
+  ///     directory is not equal to a specified one, false means it is equal.
   ///
   /// \return
   ///     Returns \b true if \b declaration is at the same file and
   ///     line, \b false otherwise.
-  bool FileAndLineEqual(const Declaration &declaration) const;
+  bool FileAndLineEqual(const Declaration &declaration, bool full) const;
 
   /// Dump a description of this object to a Stream.
   ///

lldb/source/Breakpoint/BreakpointSite.cpp

@@ -98,7 +98,7 @@ std::optional<uint32_t> BreakpointSite::GetSuggestedStackFrameIndex() {
       if (result)
         result = std::max(*loc_frame_index, *result);
       else
-        result = this_result;
+        result = loc_frame_index;
     }
   }
   return result;

lldb/source/Core/Declaration.cpp

@@ -70,8 +70,9 @@ int Declaration::Compare(const Declaration &a, const Declaration &b) {
   return 0;
 }
 
-bool Declaration::FileAndLineEqual(const Declaration &declaration) const {
-  int file_compare = FileSpec::Compare(this->m_file, declaration.m_file, false);
+bool Declaration::FileAndLineEqual(const Declaration &declaration, bool full) 
+    const {
+  int file_compare = FileSpec::Compare(this->m_file, declaration.m_file, full);
   return file_compare == 0 && this->m_line == declaration.m_line;
 }
 

lldb/source/Symbol/Block.cpp

@@ -230,7 +230,7 @@ Block *Block::GetContainingInlinedBlockWithCallSite(
     const auto *function_info = inlined_block->GetInlinedFunctionInfo();
 
     if (function_info &&
-        function_info->GetCallSite().FileAndLineEqual(find_call_site))
+        function_info->GetCallSite().FileAndLineEqual(find_call_site, true))
       return inlined_block;
     inlined_block = inlined_block->GetInlinedParent();
   }

lldb/source/Symbol/CompileUnit.cpp

@@ -360,7 +360,7 @@ void CompileUnit::ResolveSymbolContext(
           // it.
           Declaration found_decl = inline_info->GetCallSite();
           uint32_t sought_column = sought_decl.GetColumn();
-          if (found_decl.FileAndLineEqual(sought_decl) &&
+          if (found_decl.FileAndLineEqual(sought_decl, false) &&
               (sought_column == LLDB_INVALID_COLUMN_NUMBER ||
                sought_column == found_decl.GetColumn())) {
             // If we found a call site, it belongs not in this inlined block,