2 files changed, 11 insertions, 1 deletions
diff --git a/lldb/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py b/lldb/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py
index 50c3bb45068..003dd09288c 100644
--- a/lldb/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py
+++ b/lldb/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py
@@ -92,6 +92,16 @@ class ObjCDynamicValueTestCase(TestBase):
         myObserver_source = myObserver.GetChildMemberWithName ('_source', lldb.eDynamicCanRunTarget)
         self.examine_SourceDerived_ptr (myObserver_source)
 
+        #
+        #  Make sure a static value can be correctly turned into a dynamic value.
+
+        frame = thread.GetFrameAtIndex(0)
+        myObserver_static = frame.FindVariable('myObserver', lldb.eNoDynamicValues)
+        self.assertTrue (myObserver_static)
+        myObserver = myObserver_static.GetDynamicValue (lldb.eDynamicCanRunTarget)
+        myObserver_source = myObserver.GetChildMemberWithName ('_source', lldb.eDynamicCanRunTarget)
+        self.examine_SourceDerived_ptr (myObserver_source)
+
         # The "frame var" code uses another path to get into children, so let's
         # make sure that works as well:
 
diff --git a/lldb/test/lang/objc/objc-dynamic-value/dynamic-value.m b/lldb/test/lang/objc/objc-dynamic-value/dynamic-value.m
index 60a506efd8e..2bcb76b1d9d 100644
--- a/lldb/test/lang/objc/objc-dynamic-value/dynamic-value.m
+++ b/lldb/test/lang/objc/objc-dynamic-value/dynamic-value.m
@@ -125,7 +125,7 @@ handle_SourceBase (SourceBase *object)
 
 int main ()
 {
-    SourceDerived *mySource;
+    Source *mySource;
     Observer *myObserver;
 
     NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];