Skip to content

Conversation

@etcwilde
Copy link
Member

Fixing test failure on the armv7 Android builds.

@etcwilde etcwilde requested a review from meg-gupta November 14, 2025 18:46
@etcwilde etcwilde requested a review from eeckstein as a code owner November 14, 2025 18:46
@etcwilde
Copy link
Member Author

@swift-ci please test

@finagolfin
Copy link
Member

@swift-ci smoke test

@etcwilde etcwilde force-pushed the ewilde/span-bounds-check-armv7 branch from 4f86a50 to 7b7b3ef Compare November 15, 2025 22:56
@etcwilde
Copy link
Member Author

@swift-ci smoke test

1 similar comment
@finagolfin
Copy link
Member

@swift-ci smoke test

@finagolfin
Copy link
Member

Where did you get this new BITNESS variable from? I don't see it defined anywhere.

[2025-11-16T09:42:24.778Z] /home/build-user/swift/test/SILOptimizer/mutable_span_bounds_check_tests.swift:177:62: error: undefined variable: BITNESS
[2025-11-16T09:42:24.778Z] // CHECK-SIL: [[REG3:%.*]] = builtin "assumeNonNegative_Int[[BITNESS]]"([[REG2]]) : $Builtin.Int[[BITNESS]]
[2025-11-16T09:42:24.778Z]                                                              ^
[2025-11-16T09:42:24.778Z] /home/build-user/swift/test/SILOptimizer/mutable_span_bounds_check_tests.swift:177:99: error: undefined variable: BITNESS
[2025-11-16T09:42:24.778Z] // CHECK-SIL: [[REG3:%.*]] = builtin "assumeNonNegative_Int[[BITNESS]]"([[REG2]]) : $Builtin.Int[[BITNESS]]

Fixing test failure on the armv7 Android builds.
@finagolfin finagolfin force-pushed the ewilde/span-bounds-check-armv7 branch from 3e8e4b3 to efefe67 Compare November 16, 2025 10:23
@finagolfin
Copy link
Member

@swift-ci smoke test

@finagolfin finagolfin enabled auto-merge (squash) November 16, 2025 13:04
@finagolfin
Copy link
Member

Linux and Windows CI are broken right now, see swiftlang/swift-foundation#1600 and swiftlang/swift-docc#1351 for more info.

@finagolfin
Copy link
Member

@swift-ci smoke test linux

@etcwilde
Copy link
Member Author

I'm confused about what GitHub is seeing. This is the patch I pushed:

diff --git a/test/SILOptimizer/mutable_span_bounds_check_tests.swift b/test/SILOptimizer/mutable_span_bounds_check_tests.swift
index b37b8de55b7..fdf9551ba49 100644
--- a/test/SILOptimizer/mutable_span_bounds_check_tests.swift
+++ b/test/SILOptimizer/mutable_span_bounds_check_tests.swift
@@ -174,7 +174,7 @@ public func sorted(_ span: borrowing MutableSpan<Int>) -> Bool {
 // CHECK-SIL-LABEL: sil @$s31mutable_span_bounds_check_tests22outputspan_get_elementySis10OutputSpanVySiG_SitF :
 // CHECK-SIL:   [[REG1:%.*]] = struct_extract %0, #OutputSpan._count
 // CHECK-SIL:   [[REG2:%.*]] = struct_extract [[REG1]], #Int._value
-// CHECK-SIL:   [[REG3:%.*]] = builtin "assumeNonNegative_Int64"([[REG2]]) : $Builtin.Int64
+// CHECK-SIL:   [[REG3:%.*]] = builtin "assumeNonNegative_Int[[BITNESS:{{32|64}}]]"([[REG2]]) : $Builtin.Int[[BITNESS]]
 // CHECK-SIL-LABEL:} // end sil function '$s31mutable_span_bounds_check_tests22outputspan_get_elementySis10OutputSpanVySiG_SitF'
 public func outputspan_get_element(_ v: borrowing OutputSpan<Int>, _ i: Int) -> Int {
   return v[i]

@etcwilde etcwilde disabled auto-merge November 16, 2025 21:42
@finagolfin
Copy link
Member

Yep, but see the error I pasted above: lit doesn't recognize any variable called BITNESS, so if you look at the commit log above, I reverted to your original patch 11 hours ago. That passed the compiler validation suite days ago, but only didn't get through the CI because the CI was broken with other issues at the time.

@etcwilde
Copy link
Member Author

The colon in the variable is supposed to define it, I thought from the docs anyway. I wasn't sure if the alternation required the {{}} around the definition though.

@finagolfin
Copy link
Member

OK, I'm unfamiliar with that lit syntax, plus it errored saying "invalid regex," so I just reverted this pull to your earlier, simpler form.

@finagolfin
Copy link
Member

@swift-ci smoke test windows

@finagolfin finagolfin enabled auto-merge (squash) November 17, 2025 16:03
@etcwilde
Copy link
Member Author

swiftlang/swift-docc#1353
@swift-ci please test Windows

@finagolfin
Copy link
Member

I don't think the docc pull is necessary, as #85534 was merged and appeared to fix the Windows CI.

Oh well, 🤷‍♂️ as long as this is considered okay to merge...

@finagolfin finagolfin merged commit a3f9e0a into swiftlang:main Nov 17, 2025
3 checks passed
@meg-gupta
Copy link
Contributor

Thank you!

meg-gupta pushed a commit to meg-gupta/swift that referenced this pull request Nov 17, 2025
Fixing test failure on the armv7 Android builds.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants