More consistent return value for annotations, take 2 #53333
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced Feb 14, 2024
tecosaur
force-pushed
the
annotated-return-values-take-two
branch
from
9bc2d02 to
f855c1d
Compare
|
I looked up the error you are getting in the logs, and it turns out to be #53147 |
|
So I'm guessing we re-visit this once #53147 has been solved? |
|
This should be merged (rebased first though) after #53373 |
tecosaur
force-pushed
the
annotated-return-values-take-two
branch
from
f855c1d to
c4a9965
Compare
This reverts commit 81c3474.
The commit e1a76bb was ultimately reverted due to it seeming to introduce an abort signal in CI. It turns out there's an underlying issue with a compiler flag being broken, however I've also noticed that the annotation calculation for SubStrings was incorrect, as it didn't take into account the substring offset or width. We might as well fix this.
KristofferC
force-pushed
the
annotated-return-values-take-two
branch
from
c4a9965 to
efa721b
Compare
|
The failures in CI just seem to be two things with Pkg. I'm not sure if they're unrelated to this or not though? |
Seems to be the same as complained about in #53281 (comment) but not sure how this PR would cause that. |
KristofferC
pushed a commit
that referenced
this pull request
Feb 26, 2024
KristofferC
added a commit
that referenced
this pull request
Mar 1, 2024
Backported PRs: - [x] #53361 <!-- 🤖 [master] Bump the SparseArrays stdlib from c9f7293 to cb602d7 --> - [x] #53300 <!-- allow external absint to hold custom data in `codeinst.inferred` --> - [x] #53342 <!-- Add `Base.wrap` to docs --> - [x] #53372 <!-- Silence warnings in `test/file.jl` --> - [x] #53357 <!-- 🤖 [master] Bump the Pkg stdlib from 6dd0e7c9e to 76070d295 --> - [x] #53373 <!-- fix sysimage-native-code=no option with pkgimages --> - [x] #53333 <!-- More consistent return value for annotations, take 2 --> - [x] #53354 <!-- fix code coverage bug in tail position and `else` --> - [x] #53407 <!-- fix sysimage-native-code=yes option --> - [x] #53388 <!-- Fix documentation: thread pool of main thread --> - [x] #53355 <!-- Fix synchronization issues on the GC scheduler. --> - [x] #53429 <!-- Subtype: skip slow-path in `local_∀_∃_subtype` if inputs contain no ∃ typevar. --> - [x] #53437 <!-- Add debug variant of loader_trampolines.o --> - [x] #53284 <!-- Add annotate! method for AnnotatedIOBuffer --> - [x] #53466 <!-- [MozillaCACerts_jll] Update to v2023-12-12 --> - [x] #53467 <!-- [LibGit2_jll] Update to v1.7.2 --> - [x] #53326 <!-- RFC: when loading code for internal purposes, load stdlib files directly, bypassing DEPOT_PATH, LOAD_PATH, and stale checks --> - [x] #53332 - [x] #53320 <!-- Add `Sys.isreadable, Sys.iswriteable`, update `ispath` --> - [x] #53476 Contains multiple commits, manual intervention needed: - [ ] #53285 <!-- Add update mechanism for Terminfo, and common user-alias data --> Non-merged PRs with backport label: - [ ] #53424 <!-- yet more atomics & cache-line fixes on work-stealing queue --> - [ ] #53408 <!-- task splitting: change additive accumulation to multiplicative --> - [ ] #53403 <!-- Move parallel precompilation to Base --> - [ ] #53402 <!-- Add `jl_getaffinity` and `jl_setaffinity` --> - [ ] #53391 <!-- Default to the medium code model in x86 linux --> - [ ] #53125 <!-- coverage: count coverage where explicitly requested by inference only --> - [ ] #52694 <!-- Reinstate similar for AbstractQ for backward compatibility -->
tecosaur
added a commit
to tecosaur/julia
that referenced
this pull request
Mar 4, 2024
Relands JuliaLang#53281 with some fixes noticed, though not the original causes of the failure.
mkitti
pushed a commit
to mkitti/julia
that referenced
this pull request
Mar 7, 2024
Relands JuliaLang#53281 with some fixes noticed, though not the original causes of the failure.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The PR #53281 was reverted due to issues it caused in CI that could not be quickly spotted. I think I may have identified the cause, and hope to use CI here to see whether this is the case or not.