Improved the expression parser's detection of the

current context.  Previously, if there was a variable
called "self" available, the expression parser
assumed it was inside a method.  But class methods
in Objective-C also take a "self" parameter, of DWARF
type "id".  We now detect this properly, and only
assume we're in an instance method if "self" is a
pointer to an Objective-C object.

llvm-svn: 136784

1 files changed, 1 insertions, 4 deletions

diff --git a/lldb/test/lang/objc/objc-static-method/TestObjCStaticMethod.py b/lldb/test/lang/objc/objc-static-method/TestObjCStaticMethod.py
index 37c5b90924f..7e457f6e9d8 100644
--- a/lldb/test/lang/objc/objc-static-method/TestObjCStaticMethod.py
+++ b/lldb/test/lang/objc/objc-static-method/TestObjCStaticMethod.py
@@ -14,7 +14,6 @@ class TestObjCStaticMethod(TestBase):
     @python_api_test
 
     #<rdar://problem/9745789> "expression" can't call functions in class methods
-    @unittest2.expectedFailure
     def test_with_dsym_and_python_api(self):
         """Test calling functions in static methods."""
         self.buildDsym()
@@ -22,7 +21,6 @@ class TestObjCStaticMethod(TestBase):
 
     @python_api_test
     #<rdar://problem/9745789> "expression" can't call functions in class methods
-    @unittest2.expectedFailure
     def test_with_dwarf_and_python_api(self):
         """Test calling functions in static methods."""
         self.buildDwarf()
@@ -35,7 +33,6 @@ class TestObjCStaticMethod(TestBase):
         self.main_source = "static.m"
         self.break_line = line_number(self.main_source, '// Set breakpoint here.')
 
-    @unittest2.expectedFailure
     #rdar://problem/9745789 "expression" can't call functions in class methods
     def objc_static_method(self):
         """Test calling functions in static methods."""
@@ -66,7 +63,7 @@ class TestObjCStaticMethod(TestBase):
         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.")
+        self.assertTrue (sel_name == "\"doSomethingWithString:\"", "Got the right value for the selector as string.")
 
 if __name__ == '__main__':
     import atexit