eval: Allow reslicing a slice up to its cap, rather than its length #3796
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
Jille
force-pushed
the
reslice-grow
branch
3 times, most recently
from
8956776
to
394f9ea
Compare
aarzilli
reviewed
Aug 21, 2024
pkg/proc/stepping_test.go
Outdated
| @@ -956,7 +956,7 @@ func TestRangeOverFuncNext(t *testing.T) { | |||
| "result", "[]int len: 0, cap: 0, nil"), | |||
| nx(87), // if w == 2000 | |||
| assertLocals(t, "result", "w"), | |||
| assertEval(t, "result", "[]int len: 1, cap: 1, [1000]"), | |||
| assertEval(t, "result", "[]int len: 1, cap: 2, [1000]"), | |||
There was a problem hiding this comment.
If you changed this to make the linux/386 tests pass, the fix is different: see #3795
There was a problem hiding this comment.
Ah, right. I was confused by that. I've rebased on top of your PR.
aarzilli
reviewed
Aug 21, 2024
| @@ -690,7 +690,7 @@ func newVariable(name string, addr uint64, dwarfType godwarf.Type, bi *BinaryInf | |||
| v.Kind = reflect.Array | |||
| v.Base = v.Addr | |||
| v.Len = t.Count | |||
| v.Cap = -1 | |||
There was a problem hiding this comment.
I thought it was more correct to record the actual capacity of an array rather than -1. Go doesn't allow us to call cap() on a string, but it does allow it on an array, so I thought it'd be cleaner to have it.
Alternatively we can give reslicing a special case for arrays too, but this felt cleaner in the long run.
Let me know if you'd prefer this to remain -1 and I'll change reslice instead.
There was a problem hiding this comment.
Ok, I think it's fine to change it.
|
(https://snoozeth.is/dZ3T-dmNzAY) I will wait until #3795 is merged and then add a comment. |
|
Resolved. |
fix a couple of places where we needed to track the cap
|
I've rebased on master. |
yurishkuro
pushed a commit
to jaegertracing/jaeger
that referenced
this pull request
Sep 23, 2024
This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [github.com/go-delve/delve](https://redirect.github.com/go-delve/delve) | `v1.23.0` -> `v1.23.1` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>go-delve/delve (github.com/go-delve/delve)</summary> ### [`v1.23.1`](https://redirect.github.com/go-delve/delve/releases/tag/v1.23.1) [Compare Source](https://redirect.github.com/go-delve/delve/compare/v1.23.0...v1.23.1) #### What's Changed - proc: move stepping test to their own file by [@​aarzilli](https://redirect.github.com/aarzilli) in [go-delve/delve#3784 - proc: fix step stuttering when entering range-over-func bodies by [@​aarzilli](https://redirect.github.com/aarzilli) in [go-delve/delve#3788 - proc: fix TestRangeOverFuncNext on linux/386 by [@​aarzilli](https://redirect.github.com/aarzilli) in [go-delve/delve#3795 - eval: Allow reslicing a slice up to its cap, rather than its length by [@​Jille](https://redirect.github.com/Jille) in [go-delve/delve#3796 - chore: fix function name by [@​linchizhen](https://redirect.github.com/linchizhen) in [go-delve/delve#3803 - terminal/starbind: fix starlark conversion of named consts by [@​arvidfm](https://redirect.github.com/arvidfm) in [go-delve/delve#3802 - proc: workaround for macOS section name truncation by [@​aarzilli](https://redirect.github.com/aarzilli) in [go-delve/delve#3799 - service/dap: make handlesMap generic by [@​aarzilli](https://redirect.github.com/aarzilli) in [go-delve/delve#3798 - service/dap: fix test failure with 1.24 by [@​aarzilli](https://redirect.github.com/aarzilli) in [go-delve/delve#3805 - proc: fix result type of division of untyped constants by [@​aarzilli](https://redirect.github.com/aarzilli) in [go-delve/delve#3794 - proc: improve Rosetta check by [@​aarzilli](https://redirect.github.com/aarzilli) in [go-delve/delve#3810 - proc: for optimized functions allow .closureptr to not exist by [@​aarzilli](https://redirect.github.com/aarzilli) in [go-delve/delve#3808 - proc: cache module data by [@​aarzilli](https://redirect.github.com/aarzilli) in [go-delve/delve#3800 - \*: release version 1.23.1 by [@​aarzilli](https://redirect.github.com/aarzilli) in [go-delve/delve#3816 #### New Contributors - [@​Jille](https://redirect.github.com/Jille) made their first contribution in [go-delve/delve#3796 - [@​linchizhen](https://redirect.github.com/linchizhen) made their first contribution in [go-delve/delve#3803 - [@​arvidfm](https://redirect.github.com/arvidfm) made their first contribution in [go-delve/delve#3802 **Curated Changelog**: https://github.com/go-delve/delve/blob/master/CHANGELOG.md#1231-2024-09-23 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/jaegertracing/jaeger). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC44MC4wIiwidXBkYXRlZEluVmVyIjoiMzguODAuMCIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiY2hhbmdlbG9nOmRlcGVuZGVuY2llcyJdfQ==--> Signed-off-by: Mend Renovate <bot@renovateapp.com>
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.
fix a couple of places where we needed to track the cap