andr3/zls
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't iterate handles while potential invalidation occurs (#757)

Browse Source
This commit is contained in:
Techatrix 2022-11-16 23:35:19 +01:00 committed by GitHub
parent d75fd3a880
commit 46da74d32e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/references.zig
View File

@ -479,20 +479,26 @@ pub fn symbolReferences(
if (!workspace) return builder.locations; if (!workspace) return builder.locations;
var dependencies = std.StringArrayHashMapUnmanaged(void){};
for (store.handles.values()) |handle| { for (store.handles.values()) |handle| {
if (skip_std_references and std.mem.indexOf(u8, handle.uri, "std") != null) { if (skip_std_references and std.mem.indexOf(u8, handle.uri, "std") != null) {
if (!include_decl or !std.mem.eql(u8, handle.uri, curr_handle.uri)) if (!include_decl or !std.mem.eql(u8, handle.uri, curr_handle.uri))
continue; continue;
} }
var dependencies = std.ArrayListUnmanaged([]const u8){}; var handle_dependencies = std.ArrayListUnmanaged([]const u8){};
try store.collectDependencies(store.allocator, handle.*, &dependencies); try store.collectDependencies(store.allocator, handle.*, &handle_dependencies);
for (dependencies.items) |uri| { for (handle_dependencies.items) |uri| {
const hdl = store.getHandle(uri) orelse continue; try dependencies.put(arena.allocator(), uri, {});
try symbolReferencesInternal(&builder, 0, hdl, true);
} }
} }
for (dependencies.keys()) |uri| {
const handle = store.getHandle(uri) orelse continue;
try symbolReferencesInternal(&builder, 0, handle, true);
}
}, },
.pointer_payload, .pointer_payload,
.switch_payload, .switch_payload,