Build self-hosted trunk from last tag, after bringing back upstreamed patches

Author: finagolfin

swift-ci/sdks/android/build-docker

@@ -28,13 +28,9 @@ source ./scripts/toolchain-vars.sh
 # Check-out and patch the sources
 if [[ "${BUILD_COMPILER}" != "1" ]]; then
 ./scripts/fetch-source.sh --source-dir ${WORKDIR}/source --swift-tag ${SWIFT_TAG}
-else
-if [[ "${BUILD_SCHEME}" == "development" ]]; then
-./scripts/fetch-source.sh --source-dir ${WORKDIR}/source --swift-scheme main
-else
+elif [[ "${BUILD_SCHEME}" != "development" ]]; then
 ./scripts/fetch-source.sh --source-dir ${WORKDIR}/source --swift-scheme release/6.2
 fi
-fi
 ./patches/apply-patches.sh ${WORKDIR}/source/swift-project
 
 mkdir -p ${WORKDIR}/products

swift-ci/sdks/android/patches/apply-patches.sh

@@ -11,6 +11,7 @@ case "${BUILD_SCHEME}" in
     development)
         git apply -v -C1 ${patches_dir}/swift-android.patch
         git apply -v -C1 ${patches_dir}/swift-android-trunk-libdispatch.patch
+        git apply -v ${patches_dir}/swift-android-trunk-old-tag.patch
         ;;
     *)
         echo "$0: invalid BUILD_SCHEME=${BUILD_SCHEME}"

swift-ci/sdks/android/patches/swift-android-trunk-old-tag.patch

@@ -0,0 +1,149 @@
+diff --git a/swift/test/ClangImporter/pcm-emit-direct-cc1-mode.swift b/swift/test/ClangImporter/pcm-emit-direct-cc1-mode.swift
+index f5048b9e3d5..6bc26ca3177 100644
+--- a/swift/test/ClangImporter/pcm-emit-direct-cc1-mode.swift
++++ b/swift/test/ClangImporter/pcm-emit-direct-cc1-mode.swift
+@@ -15,5 +15,7 @@
+ // CHECK-CLANG-SAME: '-fmodules'
+ // CHECK-CLANG-NOT: clang importer driver args
+ 
++// XFAIL: OS=linux-androideabi
++
+ import script
+ var _ : ScriptTy
+diff --git a/swift/test/IRGen/abitypes_arm.swift b/swift/test/IRGen/abitypes_arm.swift
+index 9428294483d..52bd8b10145 100644
+--- a/swift/test/IRGen/abitypes_arm.swift
++++ b/swift/test/IRGen/abitypes_arm.swift
+@@ -11,6 +11,6 @@ class Foo {
+   }
+ }
+ 
+-// armv7: define internal void @makeOne(ptr noalias sret({{.*}}) align 4 %agg.result, float{{( noundef)?}} %f, float{{( noundef)?}} %s)
++// armv7: define internal void @makeOne(ptr{{( dead_on_unwind)?}} noalias{{( writable)?}} sret({{.*}}) align 4 %agg.result, float{{( noundef)?}} %f, float{{( noundef)?}} %s)
+ // armv7s: define internal void @makeOne(ptr noalias sret({{.*}}) align 4 %agg.result, float %f, float %s)
+ // armv7k: define internal %struct.One @makeOne(float {{.*}}%f, float {{.*}}%s)
+diff --git a/swift/test/Interop/Cxx/class/constructors-copy-module-interface.swift b/swift/test/Interop/Cxx/class/constructors-copy-module-interface.swift
+index 042c10e7d1d..254f6543b58 100644
+--- a/swift/test/Interop/Cxx/class/constructors-copy-module-interface.swift
++++ b/swift/test/Interop/Cxx/class/constructors-copy-module-interface.swift
+@@ -1,4 +1,5 @@
+ // RUN: %target-swift-ide-test -print-module -module-to-print=Constructors -I %S/Inputs -source-filename=x -enable-experimental-cxx-interop | %FileCheck %s
++// XFAIL: OS=linux-androideabi
+ 
+ // CHECK: struct TemplatedCopyConstructor
+ // CHECK: struct TemplatedCopyConstructorWithExtraArg
+diff --git a/swift/test/Interop/Cxx/class/constructors-diagnostics.swift b/swift/test/Interop/Cxx/class/constructors-diagnostics.swift
+index aac01480660..8fa99fae7fb 100644
+--- a/swift/test/Interop/Cxx/class/constructors-diagnostics.swift
++++ b/swift/test/Interop/Cxx/class/constructors-diagnostics.swift
+@@ -2,6 +2,7 @@
+ 
+ // This test uses -verify-additional-file, which do not work well on Windows.
+ // UNSUPPORTED: OS=windows-msvc
++// XFAIL: OS=linux-androideabi
+ 
+ import Constructors
+ 
+diff --git a/swift/test/Interop/Cxx/class/constructors-module-interface.swift b/swift/test/Interop/Cxx/class/constructors-module-interface.swift
+index bf189b6e302..d2c3d65f03e 100644
+--- a/swift/test/Interop/Cxx/class/constructors-module-interface.swift
++++ b/swift/test/Interop/Cxx/class/constructors-module-interface.swift
+@@ -1,4 +1,5 @@
+ // RUN: %target-swift-ide-test -print-module -module-to-print=Constructors -I %S/Inputs/ -source-filename=x -enable-experimental-cxx-interop | %FileCheck %s
++// XFAIL: OS=linux-androideabi
+ 
+ // CHECK:      struct ExplicitDefaultConstructor {
+ // CHECK-NEXT:   init()
+diff --git a/swift/test/Interop/Cxx/class/constructors-silgen.swift b/swift/test/Interop/Cxx/class/constructors-silgen.swift
+index b1624ccccfe..79cbdf170de 100644
+--- a/swift/test/Interop/Cxx/class/constructors-silgen.swift
++++ b/swift/test/Interop/Cxx/class/constructors-silgen.swift
+@@ -1,4 +1,5 @@
+ // RUN: %target-swiftxx-frontend -I %S/Inputs -Xllvm -sil-print-types -emit-silgen %s | %FileCheck %s
++// XFAIL: OS=linux-androideabi
+ 
+ import Constructors
+ 
+diff --git a/swift/test/Interop/Cxx/class/constructors-typechecker.swift b/swift/test/Interop/Cxx/class/constructors-typechecker.swift
+index 8ce10b1ca75..52ff4104b83 100644
+--- a/swift/test/Interop/Cxx/class/constructors-typechecker.swift
++++ b/swift/test/Interop/Cxx/class/constructors-typechecker.swift
+@@ -1,4 +1,5 @@
+ // RUN: %target-typecheck-verify-swift -verify-ignore-unknown -I %S/Inputs -enable-experimental-cxx-interop
++// XFAIL: OS=linux-androideabi
+ 
+ import Constructors
+ 
+diff --git a/swift/test/Interop/Cxx/class/custom-new-operator-irgen.swift b/swift/test/Interop/Cxx/class/custom-new-operator-irgen.swift
+index 74e692c9db2..0423493afac 100644
+--- a/swift/test/Interop/Cxx/class/custom-new-operator-irgen.swift
++++ b/swift/test/Interop/Cxx/class/custom-new-operator-irgen.swift
+@@ -5,4 +5,4 @@ import CustomNewOperator
+ var x = callsCustomNew()
+ 
+ // Make sure the definition of `operator new` is emitted.
+-// CHECK: define {{.*}} @{{_ZnwmPv15container_new_t|"\?\?2@YAPEAX_KPEAXUcontainer_new_t@@@Z"}}
++// CHECK: define {{.*}} @{{_Znw(j|m)Pv15container_new_t|"\?\?2@YAPEAX_KPEAXUcontainer_new_t@@@Z"}}
+diff --git a/swift/test/Reflection/conformance_descriptors.swift b/swift/test/Reflection/conformance_descriptors.swift
+index b114f764552..e1bd98c08f4 100644
+--- a/swift/test/Reflection/conformance_descriptors.swift
++++ b/swift/test/Reflection/conformance_descriptors.swift
+@@ -5,6 +5,7 @@
+ //
+ // Temporarily disable on AArch64 Linux (rdar://88451721)
+ // UNSUPPORTED: OS=linux-gnu && CPU=aarch64
++// XFAIL: OS=linux-android
+ 
+ // rdar://100558042
+ // UNSUPPORTED: CPU=arm64e
+diff --git a/swift/test/Reflection/typeref_decoding.swift b/swift/test/Reflection/typeref_decoding.swift
+index e0a3b4465a3..c01af893eda 100644
+--- a/swift/test/Reflection/typeref_decoding.swift
++++ b/swift/test/Reflection/typeref_decoding.swift
+@@ -10,6 +10,7 @@
+ 
+ // FIXME: rdar://127796117
+ // UNSUPPORTED: OS=linux-gnu && CPU=aarch64
++// XFAIL: OS=linux-android
+ 
+ // RUN: %target-build-swift -target %target-swift-5.2-abi-triple -Xfrontend -enable-anonymous-context-mangled-names %S/Inputs/ConcreteTypes.swift %S/Inputs/GenericTypes.swift %S/Inputs/Protocols.swift %S/Inputs/Extensions.swift %S/Inputs/Closures.swift -parse-as-library -emit-module -emit-library %no-fixup-chains -module-name TypesToReflect -o %t/%target-library-name(TypesToReflect)
+ // RUN: %target-build-swift -target %target-swift-5.2-abi-triple -Xfrontend -enable-anonymous-context-mangled-names %S/Inputs/ConcreteTypes.swift %S/Inputs/GenericTypes.swift %S/Inputs/Protocols.swift %S/Inputs/Extensions.swift %S/Inputs/Closures.swift %S/Inputs/main.swift -emit-module -emit-executable %no-fixup-chains -module-name TypesToReflect -o %t/TypesToReflect
+diff --git a/swift/test/SILOptimizer/package-cmo-serialize-tables.swift b/swift/test/SILOptimizer/package-cmo-serialize-tables.swift
+index 382ff2e8080..f061374b2a1 100644
+--- a/swift/test/SILOptimizer/package-cmo-serialize-tables.swift
++++ b/swift/test/SILOptimizer/package-cmo-serialize-tables.swift
+@@ -19,7 +19,7 @@
+ 
+ // Temporarily disabling on watchOS (both arm64_32 & armv7k):
+ // rdar://140330692 (🟠 OSS Swift CI: oss-swift_tools-RA_stdlib-DA_test-device-non_executable failed...
+-// UNSUPPORTED: OS=watchos
++// UNSUPPORTED: OS=watchos, OS=linux-androideabi
+ 
+ //--- main.swift
+ 
+diff --git a/swift/test/SILOptimizer/throws_prediction.swift b/swift/test/SILOptimizer/throws_prediction.swift
+index f7f2664b2de..01d36e127c6 100644
+--- a/swift/test/SILOptimizer/throws_prediction.swift
++++ b/swift/test/SILOptimizer/throws_prediction.swift
+@@ -16,7 +16,7 @@
+ // RUN:   -sil-verify-all -module-name=test -emit-sil \
+ // RUN:       | %FileCheck --check-prefix CHECK-DISABLED %s
+ 
+-// UNSUPPORTED: CPU=armv7k || CPU=arm64_32
++// UNSUPPORTED: CPU=armv7k, CPU=arm64_32, CPU=armv7
+ 
+ // CHECK-DISABLED-NOT: normal_count
+ 
+diff --git a/swift/utils/swift_build_support/swift_build_support/products/product.py b/swift/utils/swift_build_support/swift_build_support/products/product.py
+index 274b6037305..bf0f7fcf671 100644
+--- a/swift/utils/swift_build_support/swift_build_support/products/product.py
++++ b/swift/utils/swift_build_support/swift_build_support/products/product.py
+@@ -212,7 +212,7 @@ class Product(object):
+         if self.args.cross_compile_hosts:
+             if self.is_darwin_host(host_target):
+                 install_destdir = self.host_install_destdir(host_target)
+-            else:
++            elif self.args.cross_compile_append_host_target_to_destdir:
+                 install_destdir = os.path.join(install_destdir, self.args.host_target)
+         return targets.toolchain_path(install_destdir,
+                                       self.args.install_prefix)