vendor/lldb/lldb-trunk-r303197

1 files changed, 10 insertions, 10 deletions

diff --git a/include/lldb/Expression/Materializer.h b/include/lldb/Expression/Materializer.h
index ed3f91cc67ec..b86bc656d6b5 100644
--- a/include/lldb/Expression/Materializer.h
+++ b/include/lldb/Expression/Materializer.h
@@ -20,7 +20,7 @@
 #include "lldb/Expression/IRMemoryMap.h"
 #include "lldb/Symbol/TaggedASTType.h"
 #include "lldb/Target/StackFrame.h"
-#include "lldb/Utility/Error.h"
+#include "lldb/Utility/Status.h"
 #include "lldb/lldb-private-types.h"
 
 namespace lldb_private {
@@ -38,7 +38,7 @@ public:
 
     ~Dematerializer() { Wipe(); }
 
-    void Dematerialize(Error &err, lldb::addr_t frame_top,
+    void Dematerialize(Status &err, lldb::addr_t frame_top,
                        lldb::addr_t frame_bottom);
 
     void Wipe();
@@ -72,7 +72,7 @@ public:
   typedef std::weak_ptr<Dematerializer> DematerializerWP;
 
   DematerializerSP Materialize(lldb::StackFrameSP &frame_sp, IRMemoryMap &map,
-                               lldb::addr_t process_address, Error &err);
+                               lldb::addr_t process_address, Status &err);
 
   class PersistentVariableDelegate {
   public:
@@ -83,13 +83,13 @@ public:
 
   uint32_t
   AddPersistentVariable(lldb::ExpressionVariableSP &persistent_variable_sp,
-                        PersistentVariableDelegate *delegate, Error &err);
-  uint32_t AddVariable(lldb::VariableSP &variable_sp, Error &err);
+                        PersistentVariableDelegate *delegate, Status &err);
+  uint32_t AddVariable(lldb::VariableSP &variable_sp, Status &err);
   uint32_t AddResultVariable(const CompilerType &type, bool is_lvalue,
                              bool keep_in_memory,
-                             PersistentVariableDelegate *delegate, Error &err);
-  uint32_t AddSymbol(const Symbol &symbol_sp, Error &err);
-  uint32_t AddRegister(const RegisterInfo &register_info, Error &err);
+                             PersistentVariableDelegate *delegate, Status &err);
+  uint32_t AddSymbol(const Symbol &symbol_sp, Status &err);
+  uint32_t AddRegister(const RegisterInfo &register_info, Status &err);
 
   uint32_t GetStructAlignment() { return m_struct_alignment; }
 
@@ -102,11 +102,11 @@ public:
     virtual ~Entity() = default;
 
     virtual void Materialize(lldb::StackFrameSP &frame_sp, IRMemoryMap &map,
-                             lldb::addr_t process_address, Error &err) = 0;
+                             lldb::addr_t process_address, Status &err) = 0;
     virtual void Dematerialize(lldb::StackFrameSP &frame_sp, IRMemoryMap &map,
                                lldb::addr_t process_address,
                                lldb::addr_t frame_top,
-                               lldb::addr_t frame_bottom, Error &err) = 0;
+                               lldb::addr_t frame_bottom, Status &err) = 0;
     virtual void DumpToLog(IRMemoryMap &map, lldb::addr_t process_address,
                            Log *log) = 0;
     virtual void Wipe(IRMemoryMap &map, lldb::addr_t process_address) = 0;