[Lldb-commits] [lldb] r262156 - Revert "Fix bug with register values byte order in expression evaluation."

Todd Fiala via lldb-commits lldb-commits at lists.llvm.org
Sat Feb 27 14:48:51 PST 2016


Author: tfiala
Date: Sat Feb 27 16:48:50 2016
New Revision: 262156

URL: http://llvm.org/viewvc/llvm-project?rev=262156&view=rev
Log:
Revert "Fix bug with register values byte order in expression evaluation."

This reverts commit r262041, which caused asserts starting yesterday on the OS X testbot.

See details in:
https://llvm.org/bugs/show_bug.cgi?id=26758

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

Modified: lldb/trunk/source/Expression/Materializer.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/Materializer.cpp?rev=262156&r1=262155&r2=262156&view=diff
==============================================================================
--- lldb/trunk/source/Expression/Materializer.cpp (original)
+++ lldb/trunk/source/Expression/Materializer.cpp Sat Feb 27 16:48:50 2016
@@ -26,7 +26,6 @@
 #include "lldb/Target/StackFrame.h"
 #include "lldb/Target/Target.h"
 #include "lldb/Target/Thread.h"
-#include "lldb/Utility/LLDBAssert.h"
 
 using namespace lldb_private;
 
@@ -1276,15 +1275,9 @@ public:
         m_register_contents.reset(new DataBufferHeap(register_data.GetDataStart(), register_data.GetByteSize()));
 
         Error write_error;
-
-        Scalar scalar;
-        if (reg_value.GetScalarValue(scalar)) {
-            lldbassert(scalar.GetByteSize() == register_data.GetByteSize());
-            map.WriteScalarToMemory(load_addr, scalar, scalar.GetByteSize(), write_error);
-        } else {
-            map.WriteMemory(load_addr, register_data.GetDataStart(), register_data.GetByteSize(), write_error);
-        }
-
+        
+        map.WriteMemory(load_addr, register_data.GetDataStart(), register_data.GetByteSize(), write_error);
+        
         if (!write_error.Success())
         {
             err.SetErrorStringWithFormat("couldn't write the contents of register %s: %s", m_register_info.name, write_error.AsCString());




More information about the lldb-commits mailing list