Move -L-w flag to d_do_test and use IN_LLVM in objc.d/h

ldc-developers · Nov 28, 2024 · 5d86126 · 5d86126
1 parent 7423d0a
commit 5d86126
Show file tree

Hide file tree

Showing 14 changed files with 28 additions and 16 deletions.
diff --git a/dmd/objc.d b/dmd/objc.d
@@ -157,7 +157,7 @@ extern (C++) struct ObjcClassDeclaration
     bool isExtern = false;
 
     /// `true` if this class is a Swift stub
-    bool isSwiftStub = false;
+    version(IN_LLVM) bool isSwiftStub = false;
 
     /// Name of this class.
     Identifier identifier;

diff --git a/dmd/objc.h b/dmd/objc.h
@@ -37,7 +37,9 @@ struct ObjcClassDeclaration
 {
     d_bool isMeta;
     d_bool isExtern;
+#if IN_LLVM
     d_bool isSwiftStub;
+#endif
 
     Identifier* identifier;
     ClassDeclaration* classDeclaration;

diff --git a/tests/dmd/runnable/extra-files/test16096a.d b/tests/dmd/runnable/extra-files/test16096a.d
@@ -3,19 +3,22 @@ module test16096a;
 import core.attribute : selector;
 
 extern (Objective-C)
-interface Class {
+interface Class
+{
     NSObject alloc() @selector("alloc");
 }
 
 extern (Objective-C)
-interface NSObject {
-    NSObject initWithUTF8String(const(char)* str) @selector("initWithUTF8String:");
+interface NSObject
+{
+    NSObject initWithUTF8String(in char* str) @selector("initWithUTF8String:");
     void release() @selector("release");
 }
 
-extern (C) Class objc_lookUpClass(const(char)* name);
+extern (C) Class objc_lookUpClass(in char* name);
 
-void test() {
+void test()
+{
     auto c = objc_lookUpClass("NSString");
     auto o = c.alloc().initWithUTF8String("hello");
     o.release();

diff --git a/tests/dmd/runnable/objc_call.d b/tests/dmd/runnable/objc_call.d
@@ -1,5 +1,5 @@
 // EXTRA_OBJC_SOURCES:
-// REQUIRED_ARGS: -L-framework -LFoundation -L-w
+// REQUIRED_ARGS: -L-framework -LFoundation
 
 import core.attribute : selector;
 

diff --git a/tests/dmd/runnable/objc_call_static.d b/tests/dmd/runnable/objc_call_static.d
@@ -1,5 +1,5 @@
 // EXTRA_OBJC_SOURCES:
-// REQUIRED_ARGS: -L-framework -LFoundation -L-w
+// REQUIRED_ARGS: -L-framework -LFoundation
 
 import core.attribute : selector;
 

diff --git a/tests/dmd/runnable/objc_class.d b/tests/dmd/runnable/objc_class.d
@@ -1,5 +1,5 @@
 // EXTRA_OBJC_SOURCES: objc_class.m
-// REQUIRED_ARGS: -L-framework -LFoundation -L-w
+// REQUIRED_ARGS: -L-framework -LFoundation
 
 import core.attribute : selector;
 

diff --git a/tests/dmd/runnable/objc_external_class_19700.d b/tests/dmd/runnable/objc_external_class_19700.d
@@ -1,5 +1,5 @@
 // EXTRA_OBJC_SOURCES: objc_instance_variable.m
-// REQUIRED_ARGS: -L-framework -LFoundation -L-w
+// REQUIRED_ARGS: -L-framework -LFoundation
 
 import core.attribute : selector;
 

diff --git a/tests/dmd/runnable/objc_instance_variable.d b/tests/dmd/runnable/objc_instance_variable.d
@@ -1,5 +1,5 @@
 // EXTRA_OBJC_SOURCES: objc_instance_variable.m
-// REQUIRED_ARGS: -L-framework -LFoundation -L-w
+// REQUIRED_ARGS: -L-framework -LFoundation
 
 import core.attribute : selector;
 

diff --git a/tests/dmd/runnable/objc_objc_msgSend.d b/tests/dmd/runnable/objc_objc_msgSend.d
@@ -1,5 +1,5 @@
 // EXTRA_OBJC_SOURCES: objc_objc_msgSend.m
-// REQUIRED_ARGS: -L-framework -LFoundation -L-w
+// REQUIRED_ARGS: -L-framework -LFoundation
 
 import core.attribute : selector;
 

diff --git a/tests/dmd/runnable/objc_protocol.d b/tests/dmd/runnable/objc_protocol.d
@@ -1,5 +1,5 @@
 // EXTRA_OBJC_SOURCES: objc_protocol.m
-// REQUIRED_ARGS: -L-lobjc -L-w
+// REQUIRED_ARGS: -L-lobjc
 
 import core.attribute : selector;
 

diff --git a/tests/dmd/runnable/objc_protocol_sections.d b/tests/dmd/runnable/objc_protocol_sections.d
@@ -1,5 +1,5 @@
 // EXTRA_OBJC_SOURCES:
-// REQUIRED_ARGS: -L-lobjc -L-w
+// REQUIRED_ARGS: -L-lobjc
 
 // This file verifies that Objective-C protocols are put in the correct segments
 // and sections in the binary. If not, functions from the Objective-C runtime

diff --git a/tests/dmd/runnable/objc_self_test.d b/tests/dmd/runnable/objc_self_test.d
@@ -1,5 +1,5 @@
 // EXTRA_OBJC_SOURCES: objc_self_test.m
-// REQUIRED_ARGS: -L-framework -LFoundation -L-w
+// REQUIRED_ARGS: -L-framework -LFoundation
 
 extern (C) int getValue();
 

diff --git a/tests/dmd/runnable/objc_super_call.d b/tests/dmd/runnable/objc_super_call.d
@@ -1,5 +1,5 @@
 // EXTRA_OBJC_SOURCES: objc_super_call.m
-// REQUIRED_ARGS: -L-framework -LFoundation -L-w
+// REQUIRED_ARGS: -L-framework -LFoundation
 
 import core.attribute : selector;
 

diff --git a/tests/dmd/tools/d_do_test.d b/tests/dmd/tools/d_do_test.d
@@ -816,6 +816,13 @@ bool gatherTestParameters(ref TestArgs testArgs, string input_dir, string input_
 
     testArgs.objcSources = split(extraObjcSourcesStr);
 
+    // Using the ld64 linker may result in linker warnings being generated
+    // which are irrelevant to the parts of Objective-C ABI which D implements.
+    // As such we supress linker warnings for Objective-C tests to avoid
+    // linker errors when linking against Objective-C compiler output.
+    if (objc && testArgs.objcSources.length > 0)
+        testArgs.requiredArgs ~= " -L-w";
+
     // swap / with $SEP
     if (envData.sep && envData.sep != "/")
         foreach (ref s; testArgs.sources)