[Lldb-commits] [lldb] r120322 - /lldb/trunk/source/Expression/DWARFExpression.cpp

[Jason Molenda]

Author: jmolenda
Date: Mon Nov 29 15:38:58 2010
New Revision: 120322

URL: http://llvm.org/viewvc/llvm-project?rev=120322&view=rev
Log:
Fix build error when lldb is being built i386.

Modified:
    lldb/trunk/source/Expression/DWARFExpression.cpp

Modified: lldb/trunk/source/Expression/DWARFExpression.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/DWARFExpression.cpp?rev=120322&r1=120321&r2=120322&view=diff
==============================================================================
--- lldb/trunk/source/Expression/DWARFExpression.cpp (original)
+++ lldb/trunk/source/Expression/DWARFExpression.cpp Mon Nov 29 15:38:58 2010
@@ -1033,9 +1033,11 @@
                             case 2: ptr = ptr & 0xffff; break;
                             case 3: ptr = ptr & 0xffffff; break;
                             case 4: ptr = ptr & 0xffffffff; break;
-                            case 5: ptr = ptr & 0xffffffffff; break;
-                            case 6: ptr = ptr & 0xffffffffffff; break;
-                            case 7: ptr = ptr & 0xffffffffffffff; break;
+                            // the casts are added to work around the case where intptr_t is a 32 bit quantity;
+                            // presumably we won't hit the 5..7 cases if (void*) is 32-bits in this program.
+                            case 5: ptr = (intptr_t) ptr & 0xffffffffffULL; break;
+                            case 6: ptr = (intptr_t) ptr & 0xffffffffffffULL; break;
+                            case 7: ptr = (intptr_t) ptr & 0xffffffffffffffULL; break;
                             default: break;
                         }
                         stack.back().GetScalar() = ptr;