[Lldb-commits] [lldb] r113181 - /lldb/trunk/source/Core/Disassembler.cpp

[Greg Clayton]

Author: gclayton
Date: Mon Sep  6 18:11:45 2010
New Revision: 113181

URL: http://llvm.org/viewvc/llvm-project?rev=113181&view=rev
Log:
Fixed an error that could occur during disassembly that could cause a function name to be printed before the first _and_ the second instruction of disassembly when there are two symbols -- one debug symbol and one linker symbol. 

Modified:
    lldb/trunk/source/Core/Disassembler.cpp

Modified: lldb/trunk/source/Core/Disassembler.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/Disassembler.cpp?rev=113181&r1=113180&r2=113181&view=diff
==============================================================================
--- lldb/trunk/source/Core/Disassembler.cpp (original)
+++ lldb/trunk/source/Core/Disassembler.cpp Mon Sep  6 18:11:45 2010
@@ -215,7 +215,7 @@
                             uint32_t resolved_mask = module->ResolveSymbolContextForAddress(addr, eSymbolContextEverything, sc);
                             if (resolved_mask)
                             {
-                                if (prev_sc.function != sc.function || prev_sc.symbol != sc.symbol)
+                                if (!(prev_sc.function == sc.function || prev_sc.symbol == sc.symbol))
                                 {
                                     if (prev_sc.function || prev_sc.symbol)
                                         strm.EOL();