Skip to content

Unpickling: share one EntityRef per non-local reference row #20364

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
T-Gro merged 1 commit into from
Aug 27, 2026
Merged

Unpickling: share one EntityRef per non-local reference row #20364

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 14 additions & 2 deletions src/Compiler/TypedTree/TypedTreePickle.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ type ReaderState =
istrings: InputTable<string>
ipubpaths: InputTable<string[]>
inlerefs: InputTable<NonLocalEntityRef>
itcrefs: EntityRef array
isimpletys: InputTable<TType>
ifile: string
iILModule: ILModuleDef option // the Abstract IL metadata for the DLL being read
Expand Down Expand Up @@ -889,7 +890,6 @@ let decode_nleref st ccuTab stringTab (a, b) =

let lookup_nleref st nlerefTab x = lookup_uniq st nlerefTab x
let u_encoded_nleref = u_tup2 u_int (u_array u_int)
let u_nleref st = lookup_uniq st st.inlerefs (u_int st)

let encode_nleref ccuTab stringTab nlerefTab thisCcu (nleref: NonLocalEntityRef) =
#if !NO_TYPEPROVIDERS
Expand Down Expand Up @@ -1076,6 +1076,7 @@ let unpickleObjWithDanglingCcus
.Create(AnonRecdTypeInfo.NewUnlinked, (fun osgn tg -> osgn.Link tg), (fun osgn -> osgn.IsLinked), "ianoninfos", 0)
istrings = new_itbl "istrings (fake)" [||]
inlerefs = new_itbl "inlerefs (fake)" [||]
itcrefs = [||]
ipubpaths = new_itbl "ipubpaths (fake)" [||]
isimpletys = new_itbl "isimpletys (fake)" [||]
ifile = file
Expand Down Expand Up @@ -1140,6 +1141,7 @@ let unpickleObjWithDanglingCcus
istrings = stringTab
ipubpaths = pubpathTab
inlerefs = nlerefTab
itcrefs = Array.zeroCreate nlerefTab.itbl_rows.Length
isimpletys = simpletypTab
ifile = file
iILModule = ilModule
Expand Down Expand Up @@ -1966,7 +1968,17 @@ let u_tcref st =

match tag with
| 0 -> u_local_item_ref st.ientities st |> ERefLocal
| 1 -> u_nleref st |> ERefNonLocal
| 1 ->
let idx = u_int st
let nleref = lookup_uniq st st.inlerefs idx
let cached = st.itcrefs[idx]

if obj.ReferenceEquals(cached, null) then
let tcref = ERefNonLocal nleref
st.itcrefs[idx] <- tcref
tcref
else
cached
| _ -> ufailwith st "u_tcref"

let u_ucref st =
Expand Down
Loading