Merge pull request #18678 from aschwaighofer/codesign_4.2

Cherry-pick the codesign changes to 4.2

Author: aschwaighofer

cmake/modules/AddSwift.cmake

@@ -2187,6 +2187,21 @@ function(add_swift_target_executable name)
           ${SWIFTEXE_TARGET_EXCLUDE_FROM_ALL_FLAG_CURRENT}
           ${SWIFTEXE_TARGET_DONT_STRIP_NON_MAIN_SYMBOLS_FLAG}
           ${SWIFTEXE_DISABLE_ASLR_FLAG})
+
+      is_darwin_based_sdk("${sdk}" IS_DARWIN)
+      if(IS_DARWIN)
+        add_custom_command_target(unused_var2
+         COMMAND "codesign" "-f" "-s" "-" "${SWIFT_RUNTIME_OUTPUT_INTDIR}/${VARIANT_NAME}"
+         CUSTOM_TARGET_NAME "${VARIANT_NAME}_signed"
+         OUTPUT "${SWIFT_RUNTIME_OUTPUT_INTDIR}/${VARIANT_NAME}_signed"
+         DEPENDS ${VARIANT_NAME})
+      else()
+        # No code signing on other platforms.
+        add_custom_command_target(unused_var2
+         CUSTOM_TARGET_NAME "${VARIANT_NAME}_signed"
+         OUTPUT "${SWIFT_RUNTIME_OUTPUT_INTDIR}/${VARIANT_NAME}_signed"
+         DEPENDS ${VARIANT_NAME})
+       endif()
     endforeach()
   endforeach()
 endfunction()

test/CMakeLists.txt

@@ -196,7 +196,7 @@ foreach(SDK ${SWIFT_SDKS})
 
     if(SWIFT_BUILD_STDLIB AND SWIFT_INCLUDE_TESTS)
       list(APPEND test_dependencies
-          "swift-reflection-test${VARIANT_SUFFIX}")
+          "swift-reflection-test${VARIANT_SUFFIX}_signed")
     endif()
 
     if(NOT "${COVERAGE_DB}" STREQUAL "")

test/DebuggerTestingTransform/basic-assignments.swift

@@ -2,6 +2,7 @@
 
 // REQUIRES: executable_test
 // RUN: %target-build-swift -Xfrontend -debugger-testing-transform %s -o %t
+// RUN: %target-codesign %t
 // RUN: %target-run %t | %FileCheck %s -check-prefix=CHECK-E2E
 // RUN: rm -rf %t
 

test/Driver/batch_mode_with_supplementary_filelist_execution.swift

@@ -7,5 +7,6 @@
 // Also use some characters outside the BMP.
 //
 // RUN: %target-build-swift -emit-dependencies -serialize-diagnostics -driver-filelist-threshold=0 -j2 %t/main.swift  %t/𝔼-file-01.swift %t/😂-file-02.swift %t/Ω-file-03.swift -o %t/a.out
+// RUN: %target-codesign %t/a.out
 // RUN: %target-run %t/a.out | %FileCheck %s -check-prefix=CHECK-HELLO-WORLD
 // CHECK-HELLO-WORLD: Hello, World!

test/Driver/emit-sib-single-file.swift

@@ -1,18 +1,22 @@
 // RUN: %target-build-swift -Onone -emit-sib %s -o %t.sib
 // RUN: %target-build-swift %t.sib -o %t
+// RUN: %target-codesign %t
 // RUN: %target-run %t | %FileCheck %s
 
 // RUN: %target-build-swift -Onone -c %t.sib -o %t.o
-// RUN: %target-build-swift %t.o -o %t
-// RUN: %target-run %t | %FileCheck %s
+// RUN: %target-build-swift %t.o -o %t-2
+// RUN: %target-codesign %t-2
+// RUN: %target-run %t-2 | %FileCheck %s
 
 // RUN: %target-build-swift -Onone -emit-sibgen %s -o %t.sib
-// RUN: %target-build-swift %t.sib -o %t
-// RUN: %target-run %t | %FileCheck %s
+// RUN: %target-build-swift %t.sib -o %t-3
+// RUN: %target-codesign %t-3
+// RUN: %target-run %t-3 | %FileCheck %s
 
 // RUN: %target-build-swift -Onone -c %t.sib -o %t.o
-// RUN: %target-build-swift %t.o -o %t
-// RUN: %target-run %t | %FileCheck %s
+// RUN: %target-build-swift %t.o -o %t-4
+// RUN: %target-codesign %t-4
+// RUN: %target-run %t-4 | %FileCheck %s
 // REQUIRES: executable_test
 
 // CHECK: Hello World

test/Driver/sdk-link.swift

@@ -1,6 +1,7 @@
 // RUN: %empty-directory(%t)
 // RUN: %target-swift-frontend -emit-module -o %t/test.swiftmodule %s
 // RUN: %target-build-swift -g -o %t/sdk-link %s
+// RUN: %target-codesign %t/sdk-link
 // RUN: %target-run %t/sdk-link | %FileCheck %s
 // REQUIRES: executable_test
 

test/Frontend/sil-primary-file-with-sib.swift

@@ -6,6 +6,7 @@
 // RUN: %llvm-link %t/test-orig.ll -override %t/test-func.ll -o %t/test.bc
 // RUN: %target-swift-frontend -c %t/test.bc -o %t/test.o
 // RUN: %target-build-swift %t/test.o -o %t/test
+// RUN: %target-codesign %t/test
 // RUN: %target-run %t/test | %FileCheck %s
 // REQUIRES: executable_test
 

test/IRGen/meta_meta_type.swift

@@ -1,5 +1,6 @@
 // RUN: %empty-directory(%t)
 // RUN: %target-build-swift %s -o %t/a.out
+// RUN: %target-codesign %t/a.out
 // RUN: %target-run %t/a.out | %FileCheck %s
 // RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -primary-file %s -emit-ir | %FileCheck -check-prefix=CHECKIR %s
 // REQUIRES: executable_test

test/IRGen/multithread_module.swift

@@ -6,6 +6,7 @@
 
 // RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -c %S/Inputs/multithread_module/main.swift -o %t/main.o %s -o %t/mt_module.o -num-threads 2 -O -g -module-name test
 // RUN: %target-build-swift %t/main.o %t/mt_module.o -o %t/a.out
+// RUN: %target-codesign %t/a.out
 // RUN: %target-run %t/a.out | %FileCheck %s
 // REQUIRES: executable_test
 

test/IRGen/object_type.swift

@@ -1,6 +1,7 @@
 // RUN: %empty-directory(%t)
 // RUN: %target-build-swift -O %s -o %t/a.out
 // RUN: %target-build-swift -O %s -emit-ir | %FileCheck --check-prefix=CHECK-IR %s
+// RUN: %target-codesign %t/a.out
 // RUN: %target-run %t/a.out | %FileCheck %s
 // REQUIRES: executable_test