Fixed an issue with Function::GetPrologueByteSize() where if a function's first line table entry didn't have the same address as the start address of the function itself, we could end up returning and incorrect value.

llvm-svn: 118830

1 files changed, 10 insertions, 1 deletions

diff --git a/lldb/source/Symbol/Function.cpp b/lldb/source/Symbol/Function.cpp
index 52b135673d1..e89782dd3c2 100644
--- a/lldb/source/Symbol/Function.cpp
+++ b/lldb/source/Symbol/Function.cpp
@@ -500,7 +500,16 @@ Function::GetPrologueByteSize ()
         {
             LineEntry line_entry;
             if (line_table->FindLineEntryByAddress(GetAddressRange().GetBaseAddress(), line_entry))
-                m_prologue_byte_size = line_entry.range.GetByteSize();
+            {
+                // We need to take the delta of the end of the first line entry
+                // as a file address and the start file address of the function
+                // in case the first line entry doesn't start at the beginning 
+                // of the function.
+                const addr_t func_start_file_addr = m_range.GetBaseAddress().GetFileAddress();
+                const addr_t line_entry_end_file_addr = line_entry.range.GetBaseAddress().GetFileAddress() + line_entry.range.GetByteSize();
+                if (line_entry_end_file_addr > func_start_file_addr)
+                    m_prologue_byte_size = line_entry_end_file_addr - func_start_file_addr;
+            }
         }
     }
     return m_prologue_byte_size;