diff options
| -rw-r--r-- | lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCDeclVendor.cpp | 2 | ||||
| -rw-r--r-- | lldb/test/lang/objc/ivar-IMP/Makefile | 12 | ||||
| -rw-r--r-- | lldb/test/lang/objc/ivar-IMP/TestObjCiVarIMP.py | 75 | ||||
| -rw-r--r-- | lldb/test/lang/objc/ivar-IMP/myclass.h | 6 | ||||
| -rw-r--r-- | lldb/test/lang/objc/ivar-IMP/myclass.m | 16 | ||||
| -rw-r--r-- | lldb/test/lang/objc/ivar-IMP/repro.m | 7 |
6 files changed, 117 insertions, 1 deletions
diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCDeclVendor.cpp b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCDeclVendor.cpp index 76ac690e717..2c4ecf4987c 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCDeclVendor.cpp +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCDeclVendor.cpp @@ -496,7 +496,7 @@ AppleObjCDeclVendor::FinishDecl(clang::ObjCInterfaceDecl *interface_decl) if (!name || !type) return false; - const bool for_expression = true; + const bool for_expression = false; if (log) log->Printf("[ AOTV::FD] Instance variable [%s] [%s], offset at %" PRIx64, name, type, offset_ptr); diff --git a/lldb/test/lang/objc/ivar-IMP/Makefile b/lldb/test/lang/objc/ivar-IMP/Makefile new file mode 100644 index 00000000000..329ceabeea9 --- /dev/null +++ b/lldb/test/lang/objc/ivar-IMP/Makefile @@ -0,0 +1,12 @@ +LEVEL = ../../../make + +myclass.o: myclass.h myclass.m + $(CC) myclass.m -c -o myclass.o + +repro: myclass.o repro.m + $(CC) -g -O0 myclass.o repro.m -framework Foundation + +cleanup: + rm -r myclass.o + +include $(LEVEL)/Makefile.rules diff --git a/lldb/test/lang/objc/ivar-IMP/TestObjCiVarIMP.py b/lldb/test/lang/objc/ivar-IMP/TestObjCiVarIMP.py new file mode 100644 index 00000000000..d9084491e20 --- /dev/null +++ b/lldb/test/lang/objc/ivar-IMP/TestObjCiVarIMP.py @@ -0,0 +1,75 @@ +""" +Test that dynamically discovered ivars of type IMP do not crash LLDB +""" + +import os, time +import re +import unittest2 +import lldb, lldbutil +from lldbtest import * +import commands + +def execute_command (command): + # print '%% %s' % (command) + (exit_status, output) = commands.getstatusoutput (command) + # if output: + # print output + # print 'status = %u' % (exit_status) + return exit_status + +class ObjCiVarIMPTestCase(TestBase): + + mydir = TestBase.compute_mydir(__file__) + + @skipUnlessDarwin + def test_imp_ivar_type(self): + """Test that dynamically discovered ivars of type IMP do not crash LLDB""" + if self.getArchitecture() == 'i386': + # rdar://problem/9946499 + self.skipTest("Dynamic types for ObjC V1 runtime not implemented") + self.buildReproCase() + self.runTheTest() + + def setUp(self): + # Call super's setUp(). + TestBase.setUp(self) + + def buildReproCase (self): + execute_command("make repro") + + def runTheTest(self): + """MakeTest that dynamically discovered ivars of type IMP do not crash LLDB""" + def cleanup(): + execute_command("make cleanup") + self.addTearDownHook(cleanup) + + exe = os.path.join(os.getcwd(), "a.out") + + # Create a target from the debugger. + + target = self.dbg.CreateTarget (exe) + self.assertTrue(target, VALID_TARGET) + + # Set up our breakpoint + + bkpt = lldbutil.run_break_set_by_source_regexp (self, "break here") + + # Now launch the process, and do not stop at the entry point. + process = target.LaunchSimple (None, None, self.get_process_working_directory()) + + self.assertTrue(process.GetState() == lldb.eStateStopped, + PROCESS_STOPPED) + + self.expect('frame variable --ptr-depth=1 --show-types -d run -- object', substrs=[ + '(MyClass *) object = 0x', + '(void *) myImp = 0x' + ]) + self.expect('disassemble --start-address `((MyClass*)object)->myImp`', substrs=[ + '-[MyClass init]' + ]) + +if __name__ == '__main__': + import atexit + lldb.SBDebugger.Initialize() + atexit.register(lambda: lldb.SBDebugger.Terminate()) + unittest2.main() diff --git a/lldb/test/lang/objc/ivar-IMP/myclass.h b/lldb/test/lang/objc/ivar-IMP/myclass.h new file mode 100644 index 00000000000..da28d1e0518 --- /dev/null +++ b/lldb/test/lang/objc/ivar-IMP/myclass.h @@ -0,0 +1,6 @@ +#import <Foundation/Foundation.h> + +@interface MyClass : NSObject +{} +- (id)init; +@end diff --git a/lldb/test/lang/objc/ivar-IMP/myclass.m b/lldb/test/lang/objc/ivar-IMP/myclass.m new file mode 100644 index 00000000000..3ff2ac7fe78 --- /dev/null +++ b/lldb/test/lang/objc/ivar-IMP/myclass.m @@ -0,0 +1,16 @@ +#import <Foundation/Foundation.h> +#import "MyClass.h" + +@implementation MyClass +{ + IMP myImp; +} +- (id)init { + if (self = [super init]) + { + SEL theSelector = @selector(init); + self->myImp = [self methodForSelector:theSelector]; + } + return self; +} +@end diff --git a/lldb/test/lang/objc/ivar-IMP/repro.m b/lldb/test/lang/objc/ivar-IMP/repro.m new file mode 100644 index 00000000000..dc522b224a1 --- /dev/null +++ b/lldb/test/lang/objc/ivar-IMP/repro.m @@ -0,0 +1,7 @@ +#import <Foundation/Foundation.h> +#import "MyClass.h" + +int main() { + id object = [MyClass new]; + return 0; // break here +} |
