Author: tberghammer
Date: Fri Feb 26 09:33:32 2016
New Revision: 262023

URL: http://llvm.org/viewvc/llvm-project?rev=262023&view=rev
Log:
Revert part of rL262014 as it caused issues on gcc-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=262023&r1=262022&r2=262023&view=diff
==============================================================================
--- lldb/trunk/source/Expression/DWARFExpression.cpp (original)
+++ lldb/trunk/source/Expression/DWARFExpression.cpp Fri Feb 26 09:33:32 2016
@@ -1380,7 +1380,6 @@ DWARFExpression::Evaluate
                         intptr_t ptr;
                         ::memcpy (&ptr, src, sizeof(void *));
                         stack.back().GetScalar() = ptr;
-                        stack.back().SetValueType(Value::eValueTypeScalar);
                         stack.back().ClearContext();
                     }
                     break;
@@ -1395,7 +1394,6 @@ DWARFExpression::Evaluate
                             if (pointer_value != LLDB_INVALID_ADDRESS)
                             {
                                 stack.back().GetScalar() = pointer_value;
-                                
stack.back().SetValueType(Value::eValueTypeScalar);
                                 stack.back().ClearContext();
                             }
                             else
@@ -1477,7 +1475,6 @@ DWARFExpression::Evaluate
                             default: break;
                         }
                         stack.back().GetScalar() = ptr;
-                        stack.back().SetValueType(Value::eValueTypeScalar);
                         stack.back().ClearContext();
                     }
                     break;
@@ -1501,7 +1498,6 @@ DWARFExpression::Evaluate
                                     case 8: stack.back().GetScalar() = 
addr_data.GetU64(&addr_data_offset); break;
                                     default: stack.back().GetScalar() = 
addr_data.GetPointer(&addr_data_offset);
                                 }
-                                
stack.back().SetValueType(Value::eValueTypeScalar);
                                 stack.back().ClearContext();
                             }
                             else


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

Reply via email to