[Lldb-commits] [PATCH] D13777: Fix broken assert in DWARFDIE.cpp on OS X

[Todd Fiala via lldb-commits]

tfiala created this revision.
tfiala added a reviewer: tberghammer.
tfiala added a subscriber: lldb-commits.

This addresses an assert that has started firing recently on the OS X test 
suite.

The change was proposed by the assert's author, Tamas Berghammer.  (Thanks for 
the fix, Tamas!)

http://reviews.llvm.org/D13777

Files:
  source/Plugins/SymbolFile/DWARF/DWARFDIE.cpp

Index: source/Plugins/SymbolFile/DWARF/DWARFDIE.cpp
===================================================================
--- source/Plugins/SymbolFile/DWARF/DWARFDIE.cpp
+++ source/Plugins/SymbolFile/DWARF/DWARFDIE.cpp
@@ -185,7 +185,7 @@
 
         if (m_cu)
         {
-            lldb::user_id_t cu_id = ((lldb::user_id_t)m_cu->GetID())<<32;
+            lldb::user_id_t cu_id = m_cu->GetID()&0xffffffff00000000ull;
             assert ((id&0xffffffff00000000ull) == 0 ||
                     (cu_id&0xffffffff00000000ll) == 0 ||
                     (id&0xffffffff00000000ull) == 
(cu_id&0xffffffff00000000ll));



Index: source/Plugins/SymbolFile/DWARF/DWARFDIE.cpp
===================================================================
--- source/Plugins/SymbolFile/DWARF/DWARFDIE.cpp
+++ source/Plugins/SymbolFile/DWARF/DWARFDIE.cpp
@@ -185,7 +185,7 @@
 
         if (m_cu)
         {
-            lldb::user_id_t cu_id = ((lldb::user_id_t)m_cu->GetID())<<32;
+            lldb::user_id_t cu_id = m_cu->GetID()&0xffffffff00000000ull;
             assert ((id&0xffffffff00000000ull) == 0 ||
                     (cu_id&0xffffffff00000000ll) == 0 ||
                     (id&0xffffffff00000000ull) == (cu_id&0xffffffff00000000ll));

_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits