[haiku-commits] haiku: hrev44332 - src/apps/debugger/debug_info

  • From: anevilyak@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sat, 14 Jul 2012 00:25:19 +0200 (CEST)

hrev44332 adds 1 changeset to branch 'master'
old head: e6418c88b54b139e813a919f22042916a26d1c65
new head: d826a252c1014a8dc171b752290b60df904aeb17

----------------------------------------------------------------------------

d826a25: Cleanup, no functional change.

                                      [ Rene Gollent <anevilyak@xxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev44332
Commit:      d826a252c1014a8dc171b752290b60df904aeb17
URL:         http://cgit.haiku-os.org/haiku/commit/?id=d826a25
Author:      Rene Gollent <anevilyak@xxxxxxxxx>
Date:        Fri Jul 13 22:24:57 2012 UTC

----------------------------------------------------------------------------

1 file changed, 4 insertions(+), 6 deletions(-)
.../debugger/debug_info/DwarfImageDebugInfo.cpp    |   10 ++++------

----------------------------------------------------------------------------

diff --git a/src/apps/debugger/debug_info/DwarfImageDebugInfo.cpp 
b/src/apps/debugger/debug_info/DwarfImageDebugInfo.cpp
index 4a9b5c5..befa138 100644
--- a/src/apps/debugger/debug_info/DwarfImageDebugInfo.cpp
+++ b/src/apps/debugger/debug_info/DwarfImageDebugInfo.cpp
@@ -693,10 +693,12 @@ DwarfImageDebugInfo::GetStatement(FunctionDebugInfo* 
_function,
        int32 statementLine = -1;
        int32 statementColumn = -1;
        while (program.GetNextRow(state)) {
-               bool isOurFile = state.file == fileIndex;
+               // skip statements of other files
+               if (state.file != fileIndex)
+                       continue;
 
                if (statementAddress != 0
-                       && (!isOurFile || state.isStatement || 
state.isSequenceEnd)) {
+                       && (state.isStatement || state.isSequenceEnd)) {
                        target_addr_t endAddress = state.address;
                        if (address >= statementAddress && address < 
endAddress) {
                                ContiguousStatement* statement = 
new(std::nothrow)
@@ -714,10 +716,6 @@ DwarfImageDebugInfo::GetStatement(FunctionDebugInfo* 
_function,
                        statementAddress = 0;
                }
 
-               // skip statements of other files
-               if (!isOurFile)
-                       continue;
-
                if (state.isStatement) {
                        statementAddress = state.address;
                        statementLine = state.line - 1;


Other related posts:

  • » [haiku-commits] haiku: hrev44332 - src/apps/debugger/debug_info - anevilyak