Change "frame var" over to using OptionGroups (and thus the OptionGroupVariableObjectDisplay).

Change the boolean "use_dynamic" over to a tri-state, no-dynamic, dynamic-w/o running target,
and dynamic with running target.

llvm-svn: 130832

1 files changed, 9 insertions, 2 deletions

diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.cpp b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.cpp
index 62eac38e6e2..0d9d0bcf6a3 100644
--- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.cpp
+++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.cpp
@@ -194,11 +194,18 @@ AppleObjCRuntime::GetPrintForDebuggerAddr()
 bool
 AppleObjCRuntime::CouldHaveDynamicValue (ValueObject &in_value)
 {
-    return in_value.IsPointerType();
+    lldb::LanguageType known_type = in_value.GetObjectRuntimeLanguage();
+    if (known_type == lldb::eLanguageTypeObjC)
+        return true;
+    else
+        return in_value.IsPointerType();
 }
 
 bool
-AppleObjCRuntime::GetDynamicTypeAndAddress (ValueObject &in_value, TypeAndOrName &class_type_or_name, Address &address)
+AppleObjCRuntime::GetDynamicTypeAndAddress (ValueObject &in_value, 
+                                            lldb::DynamicValueType use_dynamic, 
+                                            TypeAndOrName &class_type_or_name, 
+                                            Address &address)
 {
     return false;
 }