Skip to content

Fix standalone stdlib build on Unix and make some Android CI tweaks #81601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 20, 2025
Merged

Fix standalone stdlib build on Unix and make some Android CI tweaks #81601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
188a16a
[android][test] Fix failing Frontend test on Android AArch64 CI
finagolfin May 19, 2025
432de55
[stdlib][cmake] Disable checking for bootstrapping if the host tools …
finagolfin May 19, 2025
17543c7
[android][test] Enable tests that are now passing on the Android CI r…
finagolfin May 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions stdlib/cmake/modules/SwiftSource.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -928,9 +928,9 @@ function(_compile_swift_files
endif()

set(custom_env "PYTHONIOENCODING=UTF8")
if(SWIFTFILE_IS_STDLIB OR
if(SWIFT_INCLUDE_TOOLS AND (SWIFTFILE_IS_STDLIB OR
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rintaro, building a standalone stdlib on linux is currently broken without this change, please review.

# Linux "hosttools" build require builder's runtime before building the runtime.
(BOOTSTRAPPING_MODE STREQUAL "HOSTTOOLS" AND SWIFT_HOST_VARIANT_SDK MATCHES "LINUX|ANDROID|OPENBSD|FREEBSD")
(BOOTSTRAPPING_MODE STREQUAL "HOSTTOOLS" AND SWIFT_HOST_VARIANT_SDK MATCHES "LINUX|ANDROID|OPENBSD|FREEBSD"))
)
get_bootstrapping_swift_lib_dir(bs_lib_dir "${SWIFTFILE_BOOTSTRAPPING}")
if(bs_lib_dir)
Expand Down
2 changes: 1 addition & 1 deletion test/Frontend/default-search-paths.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
// APPLE-NOSTDLIBIMPORT-NEXT: [0] BUILD_DIR/lib/swift/macosx
// APPLE-NOSTDLIBIMPORT-NEXT: (End of search path lists.)

// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource) -target x86_64-unknown-linux-android -nostdlibimport -parse %s -Rmodule-loading 2>&1 | %FileCheck -check-prefix=ANDROID-NOSTDLIBIMPORT %s
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource) -target x86_64-unknown-linux-android -nostdlibimport -parse -parse-stdlib %s -Rmodule-loading 2>&1 | %FileCheck -check-prefix=ANDROID-NOSTDLIBIMPORT %s
Copy link
Member Author

@finagolfin finagolfin May 19, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test breaks on precisely one CI without this change, the community Android AArch64 CI. That test output swallows up the same error as the earlier line in this test that I fixed a couple days ago, which I again found by running the swift-frontend command alone locally:

> /home/finagolfin/swift-DEVELOPMENT-SNAPSHOT-2025-05-14-a-ubi9/usr/bin/swift-frontend -target aarch64-unknown-linux-android -sdk /home/finagolfin/android-ndk-r27c/toolchains/llvm/prebuilt/linux-x86_64/sysroot -resource-dir /home/finagolfin/build/Ninja-Release/swift-linux-x86_64/./lib/swift -module-cache-path /home/finagolfin/build/Ninja-Release/swift-linux-x86_64/swift-test-results/aarch64-unknown-linux-android/clang-module-cache -swift-version 4 -typo-correction-limit 10 -sdk /home/finagolfin/swift/test/Inputs/clang-importer-sdk -target x86_64-unknown-linux-android -nostdlibimport -parse  /home/finagolfin/swift/test/Frontend/default-search-paths.swift -Rmodule-loading
<unknown>:0: warning: libc not found for 'x86_64-unknown-linux-android'; C stdlib may be unavailable
Module import search paths:
Framework search paths:
Implicit framework search paths:
Runtime library import search paths:
  [0] /home/finagolfin/build/Ninja-Release/swift-linux-x86_64/./lib/swift/android
  [1] /home/finagolfin/build/Ninja-Release/swift-linux-x86_64/./lib/swift/android/x86_64
(End of search path lists.)
<unknown>:0: error: could not find module '_Concurrency' for target 'x86_64-unknown-linux-android'; found: aarch64-unknown-linux-android, at: /home/finagolfin/build/Ninja-Release/swift-linux-x86_64/./lib/swift/android/_Concurrency.swiftmodule

Since this import search lookup is done independently of the -parse-stdlib flag for non-stdlib modules and the stdlib is not needed here, just adding -parse-stdlib avoids that unrelated error and gets this test to pass on the Android AArch64 CI too.

// ANDROID-NOSTDLIBIMPORT: Implicit framework search paths:
// ANDROID-NOSTDLIBIMPORT-NEXT: Runtime library import search paths:
// ANDROID-NOSTDLIBIMPORT-NEXT: [0] BUILD_DIR/lib/swift/android
Expand Down
88 changes: 0 additions & 88 deletions utils/windows-swift-android-lit-test-overrides.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,100 +46,18 @@ xfail Swift(android-aarch64) :: IDE/complete_with_visible_members.swift
xfail Swift(android-aarch64) :: IDE/print_opaque_result_type.swift
xfail Swift(android-aarch64) :: IDE/rdar141440011.swift
xfail Swift(android-aarch64) :: Index/Store/output-failure.swift
xfail Swift(android-aarch64) :: Interop/Cxx/class/access/private-fileid-diagnostics.swift
xfail Swift(android-aarch64) :: Interop/Cxx/class/closure-thunk-irgen.swift
xfail Swift(android-aarch64) :: Interop/Cxx/class/constructors-copy-irgen-android.swift
xfail Swift(android-aarch64) :: Interop/Cxx/class/constructors-irgen-android.swift
xfail Swift(android-aarch64) :: Interop/Cxx/class/destructors-correct-abi-irgen.swift
xfail Swift(android-aarch64) :: Interop/Cxx/class/function-call-irgen.swift
xfail Swift(android-aarch64) :: Interop/Cxx/foreign-reference/inheritance-diagnostics.swift
xfail Swift(android-aarch64) :: Interop/Cxx/stdlib/android-and-std-module.swift
xfail Swift(android-aarch64) :: Interop/Cxx/union/anonymous-union-partly-invalid.swift
xfail Swift(android-aarch64) :: Interop/CxxToSwiftToCxx/bridge-cxx-struct-back-to-cxx.swift
xfail Swift(android-aarch64) :: Interop/CxxToSwiftToCxx/link-cxx-type-metadata-accessor.swift
xfail Swift(android-aarch64) :: Interop/SwiftToC/functions/swift-primitive-functions-c-bridging.swift
xfail Swift(android-aarch64) :: Interop/SwiftToC/structs/large-structs-pass-return-indirect-in-c.swift
xfail Swift(android-aarch64) :: Interop/SwiftToC/structs/small-structs-64-bit-pass-return-direct-in-c.swift
xfail Swift(android-aarch64) :: Interop/SwiftToC/structs/small-structs-pass-return-direct-in-c.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/class/nested-classes-in-cxx.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/class/swift-actor-in-cxx.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/class/swift-class-availability-in-cxx.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/class/swift-class-in-cxx.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/class/swift-class-inheritance-in-cxx.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/class/swift-class-ordering.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/class/swift-class-static-variables.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/class/swift-class-virtual-method-dispatch.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/class/swift-resilient-class-virtual-method-dispatch.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/class/swift-subclass-of-resilient-class-virtual-method-dispatch.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/core/swift-impl-defs-in-cxx-64-bit.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/core/swift-impl-defs-in-cxx.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/core/validate-swift-impl-defs-in-cxx.cpp
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/cross-module-refs/do-not-expose-imported-api-by-default.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/cross-module-refs/imported-enum-refs-in-cxx.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/cross-module-refs/imported-struct-refs-in-cxx.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/cross-module-refs/not-referenced-cross-module-import.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/enums/enum-associated-value-class-type-cxx.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/enums/enum-member-param-no-shadow-case.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/enums/large-enums-pass-return-in-cxx.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/enums/resilient-enum-in-cxx.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/enums/small-enums-generated-stub-64bit.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/enums/small-enums-pass-return-in-cxx.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/enums/swift-enum-implementation.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/expose-attr/expose-rename-to-unavailable-decl.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/expose-attr/expose-swift-decls-to-cxx.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/extension/struct-extension-in-cxx.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/functions/cdecl.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/functions/function-availability.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/functions/swift-function-argument-keyword-in-cxx.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/functions/swift-function-overloads.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/functions/swift-function-unsupported-cxx-type.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/functions/swift-functions.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/functions/swift-no-expose-unsupported-alwaysEmitInClient-func.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/functions/swift-no-expose-unsupported-async-func.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/functions/swift-operators.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/functions/swift-primitive-functions-cxx-bridging.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/functions/swift-primitive-inout-functions-cxx-bridging.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/functions/swift-simd-vector-functions-cxx-bridging.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/functions/swift-transparent-functions-cxx-bridging.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/generics/generic-enum-in-cxx.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/generics/generic-function-cxx-type-invalid.cpp
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/generics/generic-function-in-cxx.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/generics/generic-struct-as-generic-func-arg-in-cpp.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/generics/generic-struct-in-cxx.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/generics/generic-struct-known-layout-direct-in-cxx.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/generics/generic-struct-known-layout-indirect-in-cxx.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/generics/generic-type-cxx-type-invalid.cpp
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/generics/generic-type-traits-fwd.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/initializers/init-in-cxx.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/initializers/swift-init-availability-in-cxx.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/macros/macro-name-collision.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/methods/method-in-cxx.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/methods/mutating-method-in-cxx.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/methods/swift-method-availability-in-cxx.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/module/module-to-namespace.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/ownership/consuming-parameter-in-cxx.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/properties/bool-is-has-in-cxx.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/properties/getter-in-cxx.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/properties/setter-in-cxx.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/properties/swift-property-availability-in-cxx.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/stdlib/combination-of-stdlib-generics-in-cxx.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/stdlib/optional/optional-in-cxx.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/stdlib/stdlib-dep-inline-in-cxx.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/stdlib/stdlib-in-cxx-no-diagnostics-generated-header.cpp
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/stdlib/swift-stdlib-in-cxx.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/structs/large-structs-pass-return-indirect-in-cxx.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/structs/nested-structs-in-cxx.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/structs/resilient-struct-in-cxx.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/structs/small-structs-pass-return-direct-in-cxx.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/structs/struct-with-opaque-layout-resilient-member-in-cxx.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/structs/struct-with-refcounted-member.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/structs/swift-struct-availability-in-cxx.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/structs/swift-struct-circular-dependent-defs.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/structs/swift-struct-in-cxx.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/unsupported/unsupported-enums-in-cxx.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/unsupported/unsupported-funcs-in-cxx.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/unsupported/unsupported-generics-in-cxx.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/unsupported/unsupported-types-in-cxx.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxxToSwift/hide-swift-module-namespace-in-swift.swift
xfail Swift(android-aarch64) :: Interop/SwiftToCxxToSwift/import-swift-class-back-to-swift.swift
xfail Swift(android-aarch64) :: ModuleInterface/BadStdlib.swiftinterface
Expand All @@ -149,7 +67,6 @@ xfail Swift(android-aarch64) :: ModuleInterface/swift_build_sdk_interfaces/check
xfail Swift(android-aarch64) :: ModuleInterface/swift_build_sdk_interfaces/compiler-uses-prebuilt-envvar.swift
xfail Swift(android-aarch64) :: ModuleInterface/swift_build_sdk_interfaces/compiler-uses-prebuilt.swift
xfail Swift(android-aarch64) :: ModuleInterface/swift_build_sdk_interfaces/track-system-dependencies.swift
xfail Swift(android-aarch64) :: SIL/clang-function-types-android.swift
xfail Swift(android-aarch64) :: SILGen/magic_identifier_file_conflicting.swift.gyb
xfail Swift(android-aarch64) :: ScanDependencies/can_import_with_map.swift
xfail Swift(android-aarch64) :: ScanDependencies/cannot_import_with_map_duplicate_entries.swift
Expand Down Expand Up @@ -191,7 +108,6 @@ xfail Swift(android-aarch64) :: api-digester/macro-gen-json.swift
xfail Swift(android-aarch64) :: api-digester/macro-gen.swift
xfail Swift(android-aarch64) :: sil-func-extractor/basic.sil
xfail Swift(android-aarch64) :: sil-func-extractor/basic.swift
xfail Swift(android-aarch64) :: stdlib/FloatConstants.swift

xfail Swift-validation(android-aarch64) :: BuildSystem/android_cross_compile.test
xfail Swift-validation(android-aarch64) :: BuildSystem/build_lld.test
Expand Down Expand Up @@ -243,7 +159,3 @@ xfail Swift-validation(android-aarch64) :: Sema/type_checker_perf/slow/rdar91310
xfail Swift-validation(android-aarch64) :: compiler_crashers_2_fixed/issue-56100.swift
xfail Swift-validation(android-aarch64) :: compiler_scale/parse_array_nested.swift.gyb
xfail Swift-validation(android-aarch64) :: execution/unavailable_decls.swift

skip Swift(android-aarch64) :: Driver/parseable_output.swift
skip Swift(android-aarch64) :: Driver/parseable_output_unicode.swift
skip Swift-validation(android-aarch64) :: compiler_crashers_fixed/28795-inprotocol-isrequirementsignaturecomputed-missing-signature.swift