Revert r268591

"Allow LanguageRuntimes to return an error if they fail in the course of dynamic type discovery

This is not meant to report that a value doesn't have a dynamic type - it is only meant as a mechanism to propagate actual type discovery issues (e.g. malformed type metadata for languages that have such a notion)

This information is used by ValueObjectDynamic to set its own m_error, which is a fairly sharp and heavyweight tool to begin with

For the time being, this is an architectural improvement but a practical no-op as no existing runtimes are actually setting errors"

I need to think about what I want to do in this space more carefully - this attempt might be too heavy of a hammer for the nail I am trying to fix, and I don't want to leave it in while I ponder

llvm-svn: 268686

16 files changed, 38 insertions, 98 deletions

diff --git a/lldb/include/lldb/Target/LanguageRuntime.h b/lldb/include/lldb/Target/LanguageRuntime.h
index 31e300ccb79..20473e3b793 100644
--- a/lldb/include/lldb/Target/LanguageRuntime.h
+++ b/lldb/include/lldb/Target/LanguageRuntime.h
@@ -54,8 +54,7 @@ public:
                               lldb::DynamicValueType use_dynamic, 
                               TypeAndOrName &class_type_or_name, 
                               Address &address,
-                              Value::ValueType &value_type,
-                              Error &error) = 0;
+                              Value::ValueType &value_type) = 0;
     
     // This call should return a CompilerType given a generic type name
     // and an ExecutionContextScope in which one can actually fetch
diff --git a/lldb/source/Core/ValueObjectDynamicValue.cpp b/lldb/source/Core/ValueObjectDynamicValue.cpp
index 3a34fdf3a86..0ac86a68f19 100644
--- a/lldb/source/Core/ValueObjectDynamicValue.cpp
+++ b/lldb/source/Core/ValueObjectDynamicValue.cpp
@@ -187,41 +187,23 @@ ValueObjectDynamicValue::UpdateValue ()
     LanguageRuntime *runtime = nullptr;
 
     lldb::LanguageType known_type = m_parent->GetObjectRuntimeLanguage();
-    
-    Error dynamic_type_discovery_error;
-    
     if (known_type != lldb::eLanguageTypeUnknown && known_type != lldb::eLanguageTypeC)
     {
         runtime = process->GetLanguageRuntime (known_type);
         if (runtime)
-            found_dynamic_type = runtime->GetDynamicTypeAndAddress (*m_parent,
-                                                                    m_use_dynamic,
-                                                                    class_type_or_name,
-                                                                    dynamic_address,
-                                                                    value_type,
-                                                                    dynamic_type_discovery_error);
+            found_dynamic_type = runtime->GetDynamicTypeAndAddress (*m_parent, m_use_dynamic, class_type_or_name, dynamic_address, value_type);
     }
     else
     {
         runtime = process->GetLanguageRuntime (lldb::eLanguageTypeC_plus_plus);
         if (runtime)
-            found_dynamic_type = runtime->GetDynamicTypeAndAddress (*m_parent,
-                                                                    m_use_dynamic,
-                                                                    class_type_or_name,
-                                                                    dynamic_address,
-                                                                    value_type,
-                                                                    dynamic_type_discovery_error);
+            found_dynamic_type = runtime->GetDynamicTypeAndAddress (*m_parent, m_use_dynamic, class_type_or_name, dynamic_address, value_type);
 
         if (!found_dynamic_type)
         {
             runtime = process->GetLanguageRuntime (lldb::eLanguageTypeObjC);
             if (runtime)
-                found_dynamic_type = runtime->GetDynamicTypeAndAddress (*m_parent,
-                                                                        m_use_dynamic,
-                                                                        class_type_or_name,
-                                                                        dynamic_address,
-                                                                        value_type,
-                                                                        dynamic_type_discovery_error);
+                found_dynamic_type = runtime->GetDynamicTypeAndAddress (*m_parent, m_use_dynamic, class_type_or_name, dynamic_address, value_type);
         }
     }
 
@@ -247,24 +229,16 @@ ValueObjectDynamicValue::UpdateValue ()
         m_type_impl.Clear();
     }
 
-    // If we don't have a dynamic type...
+    // If we don't have a dynamic type, then make ourselves just a echo of our parent.
+    // Or we could return false, and make ourselves an echo of our parent?
     if (!found_dynamic_type)
     {
-        // ...and it's not because of an error, let's make ourselves an echo of our parent
-        if (dynamic_type_discovery_error.Success())
-        {
-            if (m_dynamic_type_info)
-                SetValueDidChange(true);
-            ClearDynamicTypeInformation();
-            m_dynamic_type_info.Clear();
-            m_value = m_parent->GetValue();
-            m_error = m_value.GetValueAsData (&exe_ctx, m_data, 0, GetModule().get());
-        }
-        else
-        {
-            // ...but if it is because of an error, let's report that to the user
-            m_error = dynamic_type_discovery_error;
-        }
+        if (m_dynamic_type_info)
+            SetValueDidChange(true);
+        ClearDynamicTypeInformation();
+        m_dynamic_type_info.Clear();
+        m_value = m_parent->GetValue();
+        m_error = m_value.GetValueAsData (&exe_ctx, m_data, 0, GetModule().get());
         return m_error.Success();
     }
 
diff --git a/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp b/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp
index 84cbc11a5f0..ab5cbac2dde 100644
--- a/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp
+++ b/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp
@@ -53,8 +53,7 @@ ItaniumABILanguageRuntime::GetDynamicTypeAndAddress (ValueObject &in_value,
                                                      lldb::DynamicValueType use_dynamic, 
                                                      TypeAndOrName &class_type_or_name, 
                                                      Address &dynamic_address,
-                                                     Value::ValueType &value_type,
-                                                     Error &error)
+                                                     Value::ValueType &value_type)
 {
     // For Itanium, if the type has a vtable pointer in the object, it will be at offset 0
     // in the object.  That will point to the "address point" within the vtable (not the beginning of the
@@ -64,7 +63,6 @@ ItaniumABILanguageRuntime::GetDynamicTypeAndAddress (ValueObject &in_value,
     // start of the value object which holds the dynamic type.
     //
     
-    error.Clear();
     class_type_or_name.Clear();
     value_type = Value::ValueType::eValueTypeScalar;
     
diff --git a/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.h b/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.h
index d12752748b9..c06b9863a9b 100644
--- a/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.h
+++ b/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.h
@@ -53,8 +53,7 @@ namespace lldb_private {
                                  lldb::DynamicValueType use_dynamic,
                                  TypeAndOrName &class_type_or_name,
                                  Address &address,
-                                 Value::ValueType &value_type,
-                                 Error &error) override;
+                                 Value::ValueType &value_type) override;
         
         TypeAndOrName
         FixUpDynamicType(const TypeAndOrName& type_and_or_name,
diff --git a/lldb/source/Plugins/LanguageRuntime/Go/GoLanguageRuntime.cpp b/lldb/source/Plugins/LanguageRuntime/Go/GoLanguageRuntime.cpp
index 594b5cdeea7..c752971e7a0 100644
--- a/lldb/source/Plugins/LanguageRuntime/Go/GoLanguageRuntime.cpp
+++ b/lldb/source/Plugins/LanguageRuntime/Go/GoLanguageRuntime.cpp
@@ -140,15 +140,11 @@ GoLanguageRuntime::CouldHaveDynamicValue (ValueObject &in_value)
 }
 
 bool
-GoLanguageRuntime::GetDynamicTypeAndAddress(ValueObject &in_value,
-                                            lldb::DynamicValueType use_dynamic,
-                                            TypeAndOrName &class_type_or_name,
-                                            Address &dynamic_address,
-                                            Value::ValueType &value_type,
-                                            Error &error)
+GoLanguageRuntime::GetDynamicTypeAndAddress(ValueObject &in_value, lldb::DynamicValueType use_dynamic,
+                                            TypeAndOrName &class_type_or_name, Address &dynamic_address,
+                                            Value::ValueType &value_type)
 {
     value_type = Value::eValueTypeScalar;
-    error.Clear();
     class_type_or_name.Clear();
     if (CouldHaveDynamicValue (in_value))
     {
diff --git a/lldb/source/Plugins/LanguageRuntime/Go/GoLanguageRuntime.h b/lldb/source/Plugins/LanguageRuntime/Go/GoLanguageRuntime.h
index 6981d4a8c59..596d2888dc8 100644
--- a/lldb/source/Plugins/LanguageRuntime/Go/GoLanguageRuntime.h
+++ b/lldb/source/Plugins/LanguageRuntime/Go/GoLanguageRuntime.h
@@ -61,12 +61,9 @@ namespace lldb_private {
             return false;
         }
 
-        bool GetDynamicTypeAndAddress(ValueObject &in_value,
-                                      lldb::DynamicValueType use_dynamic,
-                                      TypeAndOrName &class_type_or_name,
-                                      Address &address,
-                                      Value::ValueType &value_type,
-                                      Error &error) override;
+        bool GetDynamicTypeAndAddress(ValueObject &in_value, lldb::DynamicValueType use_dynamic,
+                                      TypeAndOrName &class_type_or_name, Address &address,
+                                      Value::ValueType &value_type) override;
 
         bool CouldHaveDynamicValue(ValueObject &in_value) override;
 
diff --git a/lldb/source/Plugins/LanguageRuntime/Java/JavaLanguageRuntime.cpp b/lldb/source/Plugins/LanguageRuntime/Java/JavaLanguageRuntime.cpp
index 1ff5a4dbbe5..07312a8af0d 100644
--- a/lldb/source/Plugins/LanguageRuntime/Java/JavaLanguageRuntime.cpp
+++ b/lldb/source/Plugins/LanguageRuntime/Java/JavaLanguageRuntime.cpp
@@ -105,14 +105,10 @@ GetDynamicTypeId(ExecutionContext *exe_ctx, Target *target, ValueObject &in_valu
 }
 
 bool
-JavaLanguageRuntime::GetDynamicTypeAndAddress(ValueObject &in_value,
-                                              lldb::DynamicValueType use_dynamic,
-                                              TypeAndOrName &class_type_or_name,
-                                              Address &dynamic_address,
-                                              Value::ValueType &value_type,
-                                              Error &error)
+JavaLanguageRuntime::GetDynamicTypeAndAddress(ValueObject &in_value, lldb::DynamicValueType use_dynamic,
+                                              TypeAndOrName &class_type_or_name, Address &dynamic_address,
+                                              Value::ValueType &value_type)
 {
-    error.Clear();
     class_type_or_name.Clear();
 
     // null references don't have a dynamic type
diff --git a/lldb/source/Plugins/LanguageRuntime/Java/JavaLanguageRuntime.h b/lldb/source/Plugins/LanguageRuntime/Java/JavaLanguageRuntime.h
index e90ba37d2bb..83ed35dbb59 100644
--- a/lldb/source/Plugins/LanguageRuntime/Java/JavaLanguageRuntime.h
+++ b/lldb/source/Plugins/LanguageRuntime/Java/JavaLanguageRuntime.h
@@ -74,12 +74,9 @@ public:
     CouldHaveDynamicValue(ValueObject &in_value) override;
 
     bool
-    GetDynamicTypeAndAddress(ValueObject &in_value,
-                             lldb::DynamicValueType use_dynamic,
-                             TypeAndOrName &class_type_or_name,
-                             Address &address,
-                             Value::ValueType &value_type,
-                             Error &error) override;
+    GetDynamicTypeAndAddress(ValueObject &in_value, lldb::DynamicValueType use_dynamic,
+                             TypeAndOrName &class_type_or_name, Address &address,
+                             Value::ValueType &value_type) override;
 
 protected:
     JavaLanguageRuntime(Process *process);
diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.cpp b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.cpp
index de2345e8a43..9430e38f694 100644
--- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.cpp
+++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.cpp
@@ -270,10 +270,8 @@ AppleObjCRuntime::GetDynamicTypeAndAddress (ValueObject &in_value,
                                             lldb::DynamicValueType use_dynamic, 
                                             TypeAndOrName &class_type_or_name, 
                                             Address &address,
-                                            Value::ValueType &value_type,
-                                            Error &error)
+                                            Value::ValueType &value_type)
 {
-    error.Clear();
     return false;
 }
 
diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.h b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.h
index 46001552c8a..342824e79b1 100644
--- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.h
+++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.h
@@ -63,8 +63,7 @@ public:
                               lldb::DynamicValueType use_dynamic, 
                               TypeAndOrName &class_type_or_name, 
                               Address &address,
-                              Value::ValueType &value_type,
-                              Error &error) override;
+                              Value::ValueType &value_type) override;
 
     TypeAndOrName
     FixUpDynamicType (const TypeAndOrName& type_and_or_name,
diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp
index ef8679eae3c..805fca7a31b 100644
--- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp
+++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp
@@ -50,10 +50,8 @@ AppleObjCRuntimeV1::GetDynamicTypeAndAddress (ValueObject &in_value,
                                               lldb::DynamicValueType use_dynamic,
                                               TypeAndOrName &class_type_or_name,
                                               Address &address,
-                                              Value::ValueType &value_type,
-                                              Error &error)
+                                              Value::ValueType &value_type)
 {
-    error.Clear();
     class_type_or_name.Clear();
     value_type = Value::ValueType::eValueTypeScalar;
     if (CouldHaveDynamicValue(in_value))
diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.h b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.h
index 18b9f6ae875..9f9fcc69b68 100644
--- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.h
+++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.h
@@ -125,8 +125,7 @@ public:
                              lldb::DynamicValueType use_dynamic, 
                              TypeAndOrName &class_type_or_name, 
                              Address &address,
-                             Value::ValueType &value_type,
-                             Error &error) override;
+                             Value::ValueType &value_type) override;
 
     UtilityFunction *
     CreateObjectChecker(const char *) override;
diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
index 96924828257..091c157142c 100644
--- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
+++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
@@ -407,8 +407,7 @@ AppleObjCRuntimeV2::GetDynamicTypeAndAddress (ValueObject &in_value,
                                               DynamicValueType use_dynamic, 
                                               TypeAndOrName &class_type_or_name, 
                                               Address &address,
-                                              Value::ValueType &value_type,
-                                              Error &error)
+                                              Value::ValueType &value_type)
 {
     // We should never get here with a null process...
     assert (m_process != NULL);
@@ -423,7 +422,6 @@ AppleObjCRuntimeV2::GetDynamicTypeAndAddress (ValueObject &in_value,
     else
         assert (in_value.GetTargetSP().get() == m_process->CalculateTarget().get());
     
-    error.Clear();
     class_type_or_name.Clear();
     value_type = Value::ValueType::eValueTypeScalar;
 
diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h
index 181cf4ea040..8b4ca8f4e9b 100644
--- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h
+++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h
@@ -63,8 +63,7 @@ public:
                              lldb::DynamicValueType use_dynamic,
                              TypeAndOrName &class_type_or_name,
                              Address &address,
-                             Value::ValueType &value_type,
-                             Error &error) override;
+                             Value::ValueType &value_type) override;
     
     UtilityFunction *
     CreateObjectChecker(const char *) override;
diff --git a/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp b/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp
index 448655f258a..8d1dfdcf4f7 100644
--- a/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp
+++ b/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp
@@ -906,14 +906,10 @@ RenderScriptRuntime::IsVTableName(const char *name)
 }
 
 bool
-RenderScriptRuntime::GetDynamicTypeAndAddress(ValueObject &in_value,
-                                              lldb::DynamicValueType use_dynamic,
-                                              TypeAndOrName &class_type_or_name,
-                                              Address &address,
-                                              Value::ValueType &value_type,
-                                              Error &error)
+RenderScriptRuntime::GetDynamicTypeAndAddress(ValueObject &in_value, lldb::DynamicValueType use_dynamic,
+                                              TypeAndOrName &class_type_or_name, Address &address,
+                                              Value::ValueType &value_type)
 {
-    error.Clear();
     return false;
 }
 
diff --git a/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.h b/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.h
index 7747a3770ce..2a0839a1a78 100644
--- a/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.h
+++ b/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.h
@@ -178,12 +178,9 @@ public:
     IsVTableName(const char *name) override;
 
     bool
-    GetDynamicTypeAndAddress(ValueObject &in_value,
-                             lldb::DynamicValueType use_dynamic,
-                             TypeAndOrName &class_type_or_name,
-                             Address &address,
-                             Value::ValueType &value_type,
-                             Error &error) override;
+    GetDynamicTypeAndAddress(ValueObject &in_value, lldb::DynamicValueType use_dynamic,
+                             TypeAndOrName &class_type_or_name, Address &address,
+                             Value::ValueType &value_type) override;
 
     TypeAndOrName
     FixUpDynamicType(const TypeAndOrName &type_and_or_name, ValueObject &static_value) override;