Merge pull request #2115 from adrian-prantl/25587546-stable

Use a better workaround for rdar://problem/25587546

Author: adrian-prantl

lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSError.py

@@ -22,13 +22,14 @@ def test_nserror_with_run_command(self):
     def nserror_data_formatter_commands(self):
         self.expect(
             'frame variable nserror', substrs=['domain: @"Foobar" - code: 12'])
-
+         
         self.expect(
             'frame variable nserrorptr',
             substrs=['domain: @"Foobar" - code: 12'])
 
+        # FIXME: <rdar://problem/25587546> On llvm.org this works without the `-d run`!
         self.expect(
-            'frame variable nserror->_userInfo', substrs=['2 key/value pairs'])
+            'frame variable -d run -- nserror->_userInfo', substrs=['2 key/value pairs'])
 
         self.expect(
             'frame variable nserror->_userInfo --ptr-depth 1 -d run-target',