vendor/lldb/lldb-trunk-r290819

2 files changed, 29 insertions, 19 deletions

diff --git a/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/TestObjCStructArgument.py b/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/TestObjCStructArgument.py
index b2f2af766325e..75f726340ef76 100644
--- a/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/TestObjCStructArgument.py
+++ b/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/TestObjCStructArgument.py
@@ -3,13 +3,14 @@
 from __future__ import print_function
 
 
-
-import os, time
+import os
+import time
 import lldb
 from lldbsuite.test.decorators import *
 from lldbsuite.test.lldbtest import *
 from lldbsuite.test import lldbutil
 
+
 class TestObjCStructArgument(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
@@ -19,7 +20,8 @@ class TestObjCStructArgument(TestBase):
         TestBase.setUp(self)
         # Find the line numbers to break inside main().
         self.main_source = "test.m"
-        self.break_line = line_number(self.main_source, '// Set breakpoint here.')
+        self.break_line = line_number(
+            self.main_source, '// Set breakpoint here.')
 
     @skipUnlessDarwin
     @add_test_categories(['pyapi'])
@@ -31,28 +33,36 @@ class TestObjCStructArgument(TestBase):
         target = self.dbg.CreateTarget(exe)
         self.assertTrue(target, VALID_TARGET)
 
-        bpt = target.BreakpointCreateByLocation(self.main_source, self.break_line)
+        bpt = target.BreakpointCreateByLocation(
+            self.main_source, self.break_line)
         self.assertTrue(bpt, VALID_BREAKPOINT)
 
         # Now launch the process, and do not stop at entry point.
-        process = target.LaunchSimple (None, None, self.get_process_working_directory())
+        process = target.LaunchSimple(
+            None, None, self.get_process_working_directory())
 
         self.assertTrue(process, PROCESS_IS_VALID)
 
         # The stop reason of the thread should be breakpoint.
-        thread_list = lldbutil.get_threads_stopped_at_breakpoint (process, bpt)
+        thread_list = lldbutil.get_threads_stopped_at_breakpoint(process, bpt)
 
         # Make sure we stopped at the first breakpoint.
-        self.assertTrue (len(thread_list) != 0, "No thread stopped at our breakpoint.")
-        self.assertTrue (len(thread_list) == 1, "More than one thread stopped at our breakpoint.")
-            
+        self.assertTrue(
+            len(thread_list) != 0,
+            "No thread stopped at our breakpoint.")
+        self.assertTrue(len(thread_list) == 1,
+                        "More than one thread stopped at our breakpoint.")
+
         frame = thread_list[0].GetFrameAtIndex(0)
-        self.assertTrue (frame, "Got a valid frame 0 frame.")
+        self.assertTrue(frame, "Got a valid frame 0 frame.")
 
-        self.expect("p [summer sumThings:tts]", substrs = ['9'])
+        self.expect("p [summer sumThings:tts]", substrs=['9'])
 
-        self.expect("po [NSValue valueWithRect:rect]", substrs = ['NSRect: {{0, 0}, {10, 20}}'])
+        self.expect(
+            "po [NSValue valueWithRect:rect]",
+            substrs=['NSRect: {{0, 0}, {10, 20}}'])
 
-        # Now make sure we can call a method that returns a struct without crashing.
-        cmd_value = frame.EvaluateExpression ("[provider getRange]")
-        self.assertTrue (cmd_value.IsValid())
+        # Now make sure we can call a method that returns a struct without
+        # crashing.
+        cmd_value = frame.EvaluateExpression("[provider getRange]")
+        self.assertTrue(cmd_value.IsValid())
diff --git a/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/test.m b/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/test.m
index 8bf0ec07b7105..f013c5602395e 100644
--- a/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/test.m
+++ b/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/test.m
@@ -25,10 +25,10 @@ int main()
     ThingSummer *summer = [ThingSummer alloc];
     struct things_to_sum tts = { 2, 3, 4 };
     int ret = [summer sumThings:tts];
-
     NSRect rect = {{0, 0}, {10, 20}};    
-
-    // Set breakpoint here.
-    return rect.origin.x;
+	// The Objective C V1 runtime won't read types from metadata so we need
+	// NSValue in our debug info to use it in our test.
+	NSValue *v = [NSValue valueWithRect:rect];
+    return rect.origin.x; // Set breakpoint here.
   }
 }