3 files changed, 113 insertions, 0 deletions
diff --git a/lldb/test/lang/objc/objc-struct-argument/Makefile b/lldb/test/lang/objc/objc-struct-argument/Makefile
new file mode 100644
index 00000000000..c16802966cf
--- /dev/null
+++ b/lldb/test/lang/objc/objc-struct-argument/Makefile
@@ -0,0 +1,6 @@
+LEVEL = ../../../make
+
+OBJC_SOURCES := test.m
+LDFLAGS = $(CFLAGS) -lobjc -framework Foundation
+
+include $(LEVEL)/Makefile.rules
diff --git a/lldb/test/lang/objc/objc-struct-argument/TestObjCStructArgument.py b/lldb/test/lang/objc/objc-struct-argument/TestObjCStructArgument.py
new file mode 100644
index 00000000000..5e4106e56b6
--- /dev/null
+++ b/lldb/test/lang/objc/objc-struct-argument/TestObjCStructArgument.py
@@ -0,0 +1,73 @@
+"""Test passing structs to Objective-C methods."""
+
+import os, time
+import unittest2
+import lldb
+import lldbutil
+from lldbtest import *
+
+class TestObjCStructArgument(TestBase):
+
+    mydir = TestBase.compute_mydir(__file__)
+
+    @skipUnlessDarwin
+    @python_api_test
+    @dsym_test
+    def test_with_dsym_and_python_api(self):
+        """Test passing structs to Objective-C methods."""
+        self.buildDsym()
+        self.objc_class_method()
+
+    @skipUnlessDarwin
+    @python_api_test
+    @dwarf_test
+    def test_with_dwarf_and_python_api(self):
+        """Test passing structs to Objective-C methods."""
+        self.buildDwarf()
+        self.objc_class_method()
+
+    def setUp(self):
+        # Call super's setUp().
+        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.')
+
+    def objc_class_method(self):
+        """Test passing structs to Objective-C methods."""
+        exe = os.path.join(os.getcwd(), "a.out")
+
+        target = self.dbg.CreateTarget(exe)
+        self.assertTrue(target, VALID_TARGET)
+
+        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())
+
+        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)
+
+        # 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.")
+            
+        frame = thread_list[0].GetFrameAtIndex(0)
+        self.assertTrue (frame, "Got a valid frame 0 frame.")
+
+        self.expect("p [summer sumThings:tts]", substrs = ['9'])
+
+        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())
+
+if __name__ == '__main__':
+    import atexit
+    lldb.SBDebugger.Initialize()
+    atexit.register(lambda: lldb.SBDebugger.Terminate())
+    unittest2.main()
diff --git a/lldb/test/lang/objc/objc-struct-argument/test.m b/lldb/test/lang/objc/objc-struct-argument/test.m
new file mode 100644
index 00000000000..8bf0ec07b71
--- /dev/null
+++ b/lldb/test/lang/objc/objc-struct-argument/test.m
@@ -0,0 +1,34 @@
+#import <Foundation/Foundation.h>
+
+struct things_to_sum {
+    int a;
+    int b;
+    int c;
+};
+
+@interface ThingSummer : NSObject {
+};
+-(int)sumThings:(struct things_to_sum)tts;
+@end
+
+@implementation ThingSummer
+-(int)sumThings:(struct things_to_sum)tts
+{
+  return tts.a + tts.b + tts.c;
+}
+@end
+
+int main()
+{
+  @autoreleasepool
+  {
+    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;
+  }
+}