[Lldb-commits] [lldb] r180210 - Added support for pulling Objective-C class symbols

[Sean Callanan]

Author: spyffe
Date: Wed Apr 24 14:07:29 2013
New Revision: 180210

URL: http://llvm.org/viewvc/llvm-project?rev=180210&view=rev
Log:
Added support for pulling Objective-C class symbols
out of the runtime.  This allows calling static methods
on classes whose symbols have been stripped out of the
binary.

<rdar://problem/12042992>

Added:
    lldb/trunk/test/lang/objc/objc-static-method-stripped/
    lldb/trunk/test/lang/objc/objc-static-method-stripped/Makefile
    lldb/trunk/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py
    lldb/trunk/test/lang/objc/objc-static-method-stripped/static.m
Modified:
    lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp

Modified: lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp?rev=180210&r1=180209&r2=180210&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp (original)
+++ lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp Wed Apr 24 14:07:29 2013
@@ -2309,6 +2309,7 @@ AppleObjCRuntimeV2::LookupRuntimeSymbol
         llvm::StringRef name_strref(name_cstr);
         
         static const llvm::StringRef ivar_prefix("OBJC_IVAR_$_");
+        static const llvm::StringRef class_prefix("OBJC_CLASS_$_");
         
         if (name_strref.startswith(ivar_prefix))
         {
@@ -2342,7 +2343,16 @@ AppleObjCRuntimeV2::LookupRuntimeSymbol
                 }
             }
         }
-    } 
+        else if (name_strref.startswith(class_prefix))
+        {
+            llvm::StringRef class_skipped_prefix = name_strref.substr(class_prefix.size());
+            const ConstString class_name_cs(class_skipped_prefix);
+            ClassDescriptorSP descriptor = ObjCLanguageRuntime::GetClassDescriptor(class_name_cs);
+            
+            if (descriptor)
+                ret = descriptor->GetISA();
+        }
+    }
     
     return ret;
 }

Added: lldb/trunk/test/lang/objc/objc-static-method-stripped/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/objc/objc-static-method-stripped/Makefile?rev=180210&view=auto
==============================================================================
--- lldb/trunk/test/lang/objc/objc-static-method-stripped/Makefile (added)
+++ lldb/trunk/test/lang/objc/objc-static-method-stripped/Makefile Wed Apr 24 14:07:29 2013
@@ -0,0 +1,15 @@
+LEVEL = ../../../make
+
+OBJC_SOURCES := static.m
+LDFLAGS = $(CFLAGS) -lobjc -framework Foundation
+
+default:        a.out.stripped
+
+a.out.stripped: a.out.dSYM
+	strip -o a.out.stripped a.out
+
+clean::
+	rm -f a.out.stripped
+	rm -rf a.out.stripped.dSYM
+
+include $(LEVEL)/Makefile.rules

Added: lldb/trunk/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py?rev=180210&view=auto
==============================================================================
--- lldb/trunk/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py (added)
+++ lldb/trunk/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py Wed Apr 24 14:07:29 2013
@@ -0,0 +1,72 @@
+"""Test calling functions in static methods with a stripped binary."""
+
+import os, time
+import unittest2
+import lldb
+import lldbutil
+from lldbtest import *
+
+class TestObjCStaticMethodStripped(TestBase):
+
+    mydir = os.path.join("lang", "objc", "objc-static-method-stripped")
+
+    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @python_api_test
+    #<rdar://problem/12042992>
+    @dsym_test
+    def test_with_dsym_and_python_api(self):
+        """Test calling functions in static methods with a stripped binary."""
+        if self.getArchitecture() == 'i386':
+            self.skipTest("requires modern objc runtime")
+        self.buildDsym()
+        self.objc_static_method_stripped()
+
+    def setUp(self):
+        # Call super's setUp().
+        TestBase.setUp(self)
+        # Find the line numbers to break inside main().
+        self.main_source = "static.m"
+        self.break_line = line_number(self.main_source, '// Set breakpoint here.')
+
+    #<rdar://problem/12042992>
+    def objc_static_method_stripped(self):
+        """Test calling functions in static methods with a stripped binary."""
+        exe = os.path.join(os.getcwd(), "a.out.stripped")
+
+        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, os.getcwd())
+
+        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.")
+            
+        # Now make sure we can call a function in the static method we've stopped in.
+        frame = thread_list[0].GetFrameAtIndex(0)
+        self.assertTrue (frame, "Got a valid frame 0 frame.")
+
+        cmd_value = frame.EvaluateExpression ("(char *) sel_getName (_cmd)")
+        self.assertTrue (cmd_value.IsValid())
+        sel_name = cmd_value.GetSummary()
+        self.assertTrue (sel_name == "\"doSomethingWithString:\"", "Got the right value for the selector as string.")
+
+        cmd_value = frame.EvaluateExpression ("[Foo doSomethingElseWithString:string]")
+        self.assertTrue (cmd_value.IsValid())
+        string_length = cmd_value.GetValueAsUnsigned()
+        self.assertTrue (string_length == 27, "Got the right value from another class method on the same class.")
+
+if __name__ == '__main__':
+    import atexit
+    lldb.SBDebugger.Initialize()
+    atexit.register(lambda: lldb.SBDebugger.Terminate())
+    unittest2.main()

Added: lldb/trunk/test/lang/objc/objc-static-method-stripped/static.m
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/objc/objc-static-method-stripped/static.m?rev=180210&view=auto
==============================================================================
--- lldb/trunk/test/lang/objc/objc-static-method-stripped/static.m (added)
+++ lldb/trunk/test/lang/objc/objc-static-method-stripped/static.m Wed Apr 24 14:07:29 2013
@@ -0,0 +1,29 @@
+#import <Foundation/Foundation.h>
+
+ at interface Foo : NSObject
++(void) doSomethingWithString: (NSString *) string;
+-(void) doSomethingWithNothing;
+ at end
+
+ at implementation Foo
++(void) doSomethingWithString: (NSString *) string
+{
+  NSLog (@"String is: %@.", string); // Set breakpoint here.
+}
+
++(int) doSomethingElseWithString: (NSString *) string
+{
+  NSLog (@"String is still: %@.", string);
+  return [string length];
+}
+
+-(void) doSomethingWithNothing
+{
+}
+ at end
+
+int main()
+{
+  [Foo doSomethingWithString: @"Some string I have in mind."];
+  return 0;
+}