Skip to content
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

Jump to bottom

Backport: nested function name canonicalization #179

Merged
merged 1 commit into from
Dec 5, 2024
Merged

Backport: nested function name canonicalization #179

merged 1 commit into from
Dec 5, 2024

Conversation

kpamnany
Copy link
Collaborator

@kpamnany kpamnany commented Sep 11, 2024 •
edited
Loading

PR Description

Backports JuliaLang#53719.

Checklist

Requirements for merging:

@kpamnany kpamnany requested a review from d-netto September 11, 2024 15:32
@github-actions github-actions bot added port-to-v1.10 This change should apply to Julia v1.10 builds port-to-master This change should apply to all future Julia builds labels Sep 11, 2024
d-netto
d-netto reviewed Sep 11, 2024
View reviewed changes
Copy link
Member

@d-netto d-netto left a comment

Choose a reason for hiding this comment

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

Have a minor comment.

I'd be more confident on this backport if you could run the JuliaLang tests locally on your machine and report the results here.

src/julia-syntax.scm Outdated Show resolved Hide resolved
@kpamnany
Copy link
Collaborator Author

Some failures:

<snip>
asyncmap                                         (15) |    17.35 |   0.38 |  2.2 |     682.96 |   579.92                                                                               
SparseArrays/linalg_solvers                      (15) |        started at 2024-09-12T14:43:22.234                                                                                      
show                                             (31) |         failed at 2024-09-12T14:43:22.912                                                                                      
Test Failed at /home/ubuntu/julia.rai/test/show.jl:790                                                                                                                                 
  Expression: occursin(r"var\"#foo2##[0-9]+", sprint(show, (M53719.foo2(1))(2), context = :module => M53719))                                                                          
   Evaluated: occursin(r"var\"#foo2##[0-9]+", "var\"#bar2##1#bar2##2\"{Int64, Int64}(2, 1)")                                                                                           
                                                                                                                                                                                       
Test Failed at /home/ubuntu/julia.rai/test/show.jl:801                                                                                                                                 
  Expression: occursin(r"var\"#bar#foo##[0-9]+", sprint(show, typeof(M53719.foo(1)), context = :module => M53719))                                                                     
   Evaluated: occursin(r"var\"#bar#foo##[0-9]+", "var\"#bar#bar##0\"{Int64}")                                                                                                          
                                                                                                                                                                                       
Test Failed at /home/ubuntu/julia.rai/test/show.jl:803                                                                                                                                 
  Expression: occursin(r"var\"#baz#foo##[0-9]+", sprint(show, typeof((M53719.foo(1))(2)), context = :module => M53719))                                                                
   Evaluated: occursin(r"var\"#baz#foo##[0-9]+", "var\"#baz#bar##1\"{Int64, Int64}")                                                                                                   
                                                                                                                                                                                       
Test Failed at /home/ubuntu/julia.rai/test/show.jl:805                                                                                                                                 
  Expression: occursin(r"var\"#bar2#foo2##[0-9]+", sprint(show, typeof(M53719.foo2(1)), context = :module => M53719))                                                                  
   Evaluated: occursin(r"var\"#bar2#foo2##[0-9]+", "var\"#bar2#bar2##0\"{Int64}")                                                                                                      
                                                                                                                                                                                       
Test Failed at /home/ubuntu/julia.rai/test/show.jl:807                                                                                                                                 
  Expression: occursin(r"var\"#foo2##[0-9]+#foo2##[0-9]+", sprint(show, typeof((M53719.foo2(1))(2)), context = :module => M53719))                                                     
   Evaluated: occursin(r"var\"#foo2##[0-9]+#foo2##[0-9]+", "var\"#bar2##1#bar2##2\"{Int64, Int64}")
<snip>

@kpamnany kpamnany added port-to-v1.10 This change should apply to Julia v1.10 builds and removed port-to-v1.10 This change should apply to Julia v1.10 builds port-to-master This change should apply to all future Julia builds labels Sep 15, 2024
@d-netto d-netto force-pushed the kp-backport-53719 branch 2 times, most recently from df219a8 to 38af02c Compare September 23, 2024 16:36
nickrobinson251 pushed a commit that referenced this pull request Sep 23, 2024
@DilumAluthgeBot @DilumAluthge
🤖 [master] Bump the Tar stdlib from 81888a3 to 1114260 (JuliaLang#54670)
ef19235 
Stdlib: Tar
URL: https://github.com/JuliaIO/Tar.jl.git
Stdlib branch: master
Julia branch: master
Old commit: 81888a3
New commit: 1114260
Julia version: 1.12.0-DEV
Tar version: 1.10.0(Does not match)
Bump invoked by: @StefanKarpinski
Powered by:
[BumpStdlibs.jl](https://github.com/JuliaLang/BumpStdlibs.jl)

Diff:
JuliaIO/Tar.jl@81888a3...1114260

```
$ git log --oneline 81888a3..1114260
1114260 Accept other string types for all string arguments (fix #179) (#180)
a2e39d6 Bump julia-actions/cache from 1 to 2 (#178)
152d12e Bump julia-actions/setup-julia from 1 to 2 (#177)
5012536 Fix Codecov (#176)
9b5460b Add `public` declarations using `eval` (#175)
4e9d73a Add docstring for Tar module (#173)
38a4bf4 Bump codecov/codecov-action from 3 to 4 (#172)
166deb3 [CI] Switch to `julia-actions/cache` (#171)
d0085d8 Hardcode doc edit backlink (#164)
7e83ed7 [NFC] fix some wonky formatting (#168)
6269b5b Bump actions/checkout from 3 to 4 (#163)
```

Co-authored-by: Dilum Aluthge <[email protected]>
d-netto
d-netto approved these changes Sep 23, 2024
View reviewed changes
Copy link
Member

@d-netto d-netto left a comment

Choose a reason for hiding this comment

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

👍.

Please confirm it passes raicode CI before merging.

@github-actions GitHub Actions
Copy link

This PR is stale because it has been open 30 days with no activity. Comment or remove stale label, or this PR will be closed in 5 days.

@github-actions github-actions bot added the stale This pull request is inactive label Oct 24, 2024
@kpamnany kpamnany removed the stale This pull request is inactive label Oct 24, 2024
@github-actions GitHub Actions
Copy link

This PR is stale because it has been open 30 days with no activity. Comment or remove stale label, or this PR will be closed in 5 days.

@github-actions github-actions bot added the stale This pull request is inactive label Nov 26, 2024
@kpamnany kpamnany removed the stale This pull request is inactive label Nov 26, 2024
@d-netto @kpamnany
Canonicalize names of nested functions by keeping a more fine grained…
c374a07 
… counter -- per (module, method name) pair (JuliaLang#53719)

As mentioned in JuliaLang#53716, we've
been noticing that `precompile` statements lists from one version of our
codebase often don't apply cleanly in a slightly different version.

That's because a lot of nested and anonymous function names have a
global numeric suffix which is incremented every time a new name is
generated, and these numeric suffixes are not very stable across
codebase changes.

To solve this, this PR makes the numeric suffixes a bit more fine
grained: every pair of (module, top-level/outermost function name) will
have its own counter, which should make nested function names a bit more
stable across different versions.

This PR applies @JeffBezanson's idea of making the symbol name changes
directly in `current-julia-module-counter`.

Here is an example:

```Julia
julia> function foo(x)
           function bar(y)
               return x + y
           end
       end
foo (generic function with 1 method)

julia> f = foo(42)
(::var"#bar#foo##0"{Int64}) (generic function with 1 method)
```
@kpamnany kpamnany merged commit 9344ba8 into v1.10.2+RAI Dec 5, 2024
1 check passed
@kpamnany kpamnany deleted the kp-backport-53719 branch December 5, 2024 20:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@d-netto d-netto d-netto approved these changes

Assignees
No one assigned
Labels
port-to-v1.10 This change should apply to Julia v1.10 builds
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@kpamnany @d-netto