[lldb] Replace unneeded use of Foundation with ObjectiveC in tests (NFC)

[kastiglione]

Summary

When referencing NSObject, it's enough to import objc/NSObject.h. Importing Foundation is unnecessary in these cases.

[teemperor]

Thanks for cleaning this up!

lldb/test/API/commands/frame/recognizer/main.m

1

I guess this could also be just stdio.h (FWIW, the printfs in tests can also be removed as they just require including system headers and are essentially never useful).

[teemperor]

lldb/test/API/commands/frame/recognizer/main.m

1

Just to be clear: I'm just saying that removing printfs and everything else that references system headers is usually always a good idea but I'm not asking that you should remove them here too. The stdio.h is perfect for this patch.

[kastiglione]

fix lldb/test/API/commands/frame/recognizer/main.m

[kastiglione]

lldb/test/API/commands/frame/recognizer/main.m

1

thanks for reviewing closely, a bunch of these changes were automated and I am guilty of not looking closely (if the test passed then I didn't look closer)

[teemperor]

lldb/test/API/commands/frame/recognizer/main.m

1

I was actually just looking if we had a "check that we didn't load a type from Foundation"-kind of test (as that was the only thing that I could see this could break

lldb/test/API/commands/expression/context-object-objc/Makefile

 OBJC_SOURCES := main.m
-LD_EXTRAS := -framework Foundation
+LD_EXTRAS := -lobjc
+
 include Makefile.rules

lldb/test/API/commands/expression/context-object-objc/main.m

-#import <Foundation/Foundation.h>
+#import <objc/NSObject.h>
 
 @interface ObjcClass : NSObject {
     int field;
 }
 
 @property int property;
 
 +(ObjcClass*)createNew;

lldb/test/API/commands/expression/namespace_local_var_same_name_obj_c/main.mm

-#import <Foundation/Foundation.h>
+#import <objc/NSObject.h>
 @interface Util : NSObject
 + (void)debugPrintErrorStatic;
 - (void)debugPrintError;
 @end
 
 int main(int argc, const char * argv[]) {
   [Util debugPrintErrorStatic];
 
   Util *u = [[Util alloc] init];
 
   [u debugPrintError];
 
   return 0;
 }
 

lldb/test/API/commands/frame/recognizer/Makefile

 OBJC_SOURCES := main.m
-
 CFLAGS_EXTRAS := -g0 # No debug info.
 MAKE_DSYM := NO
 
-
-
-LD_EXTRAS := -framework Foundation
 include Makefile.rules

lldb/test/API/commands/frame/recognizer/main.m

-#import <Foundation/Foundation.h>
+#import <stdio.h>
 
 void foo(int a, int b)
 {
     printf("%d %d\n", a, b);
 }
 
 void bar(int *ptr) { printf("%d\n", *ptr); }
 
 int main (int argc, const char * argv[])
 {
     foo(42, 56);
     int i = 78;
     bar(&i);
     return 0;
 }

lldb/test/API/functionalities/type_lookup/Makefile

 OBJCXX_SOURCES := main.mm
-
 CFLAGS_EXTRAS := -w
+LD_EXTRAS := -lobjc
 
-
-
-LD_EXTRAS := -framework Foundation
 include Makefile.rules

lldb/test/API/functionalities/type_lookup/main.mm

-#import <Foundation/Foundation.h>
+#import <objc/NSObject.h>
 
 class MyCPPClass {
 public:
     MyCPPClass(float f) : f(f) {}
     
     float setF(float f) {
       float oldf = this->f;
       this->f = f;

lldb/test/API/lang/objc/bitfield_ivars/Makefile

 OBJC_SOURCES := main.m
-LD_EXTRAS = -framework Foundation
+LD_EXTRAS = -lobjc
 
 include Makefile.rules

lldb/test/API/lang/objc/bitfield_ivars/main.m

-#import <Foundation/Foundation.h>
+#import <objc/NSObject.h>
 
 typedef struct {
     unsigned char fieldOne : 1;
     unsigned char fieldTwo : 1;
     unsigned char fieldThree : 1;
     unsigned char fieldFour : 1;
     unsigned char fieldFive : 1;
 } UCBitFields;

lldb/test/API/lang/objc/blocks/Makefile

 OBJC_SOURCES := ivars-in-blocks.m main.m
-LD_EXTRAS := -lobjc -framework Foundation
+LD_EXTRAS := -lobjc
 
 include Makefile.rules

lldb/test/API/lang/objc/blocks/ivars-in-blocks.h

-#import <Foundation/Foundation.h>
+#import <objc/NSObject.h>
 
 @interface IAmBlocky : NSObject
 {
   @public
   int blocky_ivar;
 }
 + (void) classMethod;
 - (IAmBlocky *) init;
 - (int) callABlock: (int) block_value;
 @end

lldb/test/API/lang/objc/blocks/ivars-in-blocks.m

 #import "ivars-in-blocks.h"
+#import <stdio.h>
 
 typedef int (^my_block_ptr_type) (int);
 
 @interface IAmBlocky()
 {
   int _hidden_ivar;
   my_block_ptr_type _block_ptr;
 }

lldb/test/API/lang/objc/conflicting-definition/Test/Test.h

-#import <Foundation/Foundation.h>
 #import <Test/Foo.h>
+#import <objc/NSObject.h>
 
 @interface Test : NSObject {
 @public
     CMTimeRange _range;
 }
 - (void) doTest;
 @end
 

lldb/test/API/lang/objc/forward-decl/Container.h

-#import <Foundation/Foundation.h>
+#import <objc/NSObject.h>
 
 @class ForwardDeclaredClass;
 
 @interface Container : NSObject {
 @public
     ForwardDeclaredClass *member;
 }
 
 -(id)init;
 -(ForwardDeclaredClass*)getMember;
 
 @end

lldb/test/API/lang/objc/forward-decl/Makefile

 DYLIB_NAME := Container
 DYLIB_OBJC_SOURCES := Container.m
 OBJC_SOURCES := main.m
+LD_EXTRAS := -lobjc
 
-
-
-LD_EXTRAS := -framework Foundation
 include Makefile.rules

lldb/test/API/lang/objc/forward-decl/main.m

-#import <Foundation/Foundation.h>
+#import <objc/NSObject.h>
 #import "Container.h"
+#import <stdio.h>
 
 int main(int argc, const char * argv[])
 {
 
     @autoreleasepool {
         Container *j = [[Container alloc] init];
 
         printf("member value = %p", [j getMember]); // Set breakpoint 0 here.
     }   
     return 0;
 }
 

lldb/test/API/lang/objc/foundation/my-base.m

-#import <Foundation/Foundation.h>
+#import <objc/NSObject.h>
 #import "my-base.h"
 @implementation MyBase
 #if __OBJC2__
 @synthesize propertyMovesThings;
 #else
 @synthesize propertyMovesThings = maybe_used;
 #endif
 @end
 

lldb/test/API/lang/objc/hidden-ivars/InternalDefiner.h

-#import <Foundation/Foundation.h>
+#import <objc/NSObject.h>
 #import <stdint.h>
 
 @interface InternalDefiner : NSObject {
 @public
     uintptr_t foo;
 }
 
 -(id)initWithFoo:(uintptr_t)f andBar:(uintptr_t)b;
 
 @end

lldb/test/API/lang/objc/ivar-IMP/Makefile

 OBJC_SOURCES := myclass.m repro.m
-LD_EXTRAS := -framework Foundation
+LD_EXTRAS := -lobjc
 
 include Makefile.rules
 
 # Force myclass.m to be compiled without debug info
 myclass.o: CFLAGS = $(CFLAGS_NO_DEBUG)
 

lldb/test/API/lang/objc/ivar-IMP/myclass.h

-#import <Foundation/Foundation.h>
+#import <objc/NSObject.h>
 
 @interface MyClass : NSObject
 {}
 - (id)init;
 @end

lldb/test/API/lang/objc/ivar-IMP/myclass.m

-#import <Foundation/Foundation.h>
+#import <objc/NSObject.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

lldb/test/API/lang/objc/ivar-IMP/repro.m

-#import <Foundation/Foundation.h>
+#import <objc/NSObject.h>
 #import "myclass.h"
 
 int main() {
   id object = [MyClass new];
   return 0; // break here
 }

lldb/test/API/lang/objc/modules-objc-property/main.m

-@import Foundation;
+@import ObjectiveC;
 @import myModule;
 
 int main() {
     MyClass *m = [[MyClass alloc] init];
     int i = m.propConflict + MyClass.propConflict;
     return i; // Set breakpoint here.
 }

lldb/test/API/lang/objc/modules-objc-property/myModule.h

 #ifndef MYMODULE
 #define MYMODULE
 
-@import Foundation;
+@import ObjectiveC;
 
 @interface MyClass : NSObject
 - (int) propConflict;
 + (int) propConflict;
 @property(readonly) int propConflict;
 @property(readonly,class) int propConflict;
 @end
 

lldb/test/API/lang/objc/objc-ivar-offsets/Makefile

 OBJC_SOURCES := objc-ivar-offsets.m main.m
-LD_EXTRAS := -lobjc -framework Foundation
+LD_EXTRAS := -lobjc
 
 include Makefile.rules

lldb/test/API/lang/objc/objc-ivar-offsets/objc-ivar-offsets.h

-#import <Foundation/Foundation.h>
+#import <objc/NSObject.h>
+#import <stdint.h>
 
 @interface BaseClass : NSObject
 {
   int _backed_int;
 #if !__OBJC2__
   int _unbacked_int;
 #endif
 }

lldb/test/API/lang/objc/objc-super/Makefile

 OBJC_SOURCES := class.m
-LD_EXTRAS := -lobjc -framework Foundation
+LD_EXTRAS := -lobjc
 
 include Makefile.rules

lldb/test/API/lang/objc/objc-super/class.m

-#import <Foundation/Foundation.h>
+#import <objc/NSObject.h>
 
 @interface Foo : NSObject {
 }
 -(int)get;
 @end
 
 @implementation Foo
 -(int)get

lldb/test/API/lang/objcxx/class-name-clash/myobject.mm

-#import <Foundation/Foundation.h>
+#import <objc/NSObject.h>
 
 @interface MyObject : NSObject
 @end
 
 @implementation MyObject
 @end

lldb/test/API/python_api/class_members/main.mm

-#import <Foundation/Foundation.h>
+#import <objc/NSObject.h>
 
 class Base {
 public:
     int foo(int x, int y) { return 1; }
     char bar(int x, char y) { return 2; }
     void dat() {}
     static int sfunc(char, int, float) { return 3; }
 };

lldb/test/API/python_api/objc_type/Makefile

 OBJC_SOURCES := main.m
-
 CFLAGS_EXTRAS := -w
+LD_EXTRAS := -lobjc
 
-
-
-LD_EXTRAS := -framework Foundation
 include Makefile.rules

lldb/test/API/python_api/objc_type/main.m

-#import <Foundation/Foundation.h>
+#import <objc/NSObject.h>
 
 @interface Foo: NSObject
 {}
 - (id) init;
 @end
 
 @interface Bar: Foo
 {