Skip to content

Fix issue due to duplicated indexstore bindings in Swift Build and TSC #557

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

Closed
wants to merge 1 commit into from
Closed

Fix issue due to duplicated indexstore bindings in Swift Build and TSC #557

Show file tree
Hide file tree
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
6 changes: 1 addition & 5 deletions Sources/SWBCSupport/IndexStore.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,14 +181,10 @@ typedef struct {
indexstore_string_ref_t
(*unit_dependency_get_name)(indexstore_unit_dependency_t);

bool
(*unit_reader_dependencies_apply)(indexstore_unit_reader_t,
bool(^applier)(indexstore_unit_dependency_t));

bool
(*unit_reader_dependencies_apply_f)(indexstore_unit_reader_t,
void *context,
bool(*applier)(void *context, indexstore_unit_dependency_t));
} indexstore_functions_t;
} swiftbuild_indexstore_functions_t;

#endif
4 changes: 2 additions & 2 deletions Sources/SWBUtil/IndexStore.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ private final class IndexStoreAPIImpl {
private let dylib: LibraryHandle

/// The index store API functions.
fileprivate let fn: indexstore_functions_t
fileprivate let fn: swiftbuild_indexstore_functions_t

fileprivate func call<T>(_ fn: (inout indexstore_error_t?) -> T) throws -> T {
var error: indexstore_error_t? = nil
Expand All @@ -354,7 +354,7 @@ private final class IndexStoreAPIImpl {
self.path = path
self.dylib = try Library.open(path)

var api = indexstore_functions_t()
var api = swiftbuild_indexstore_functions_t()
api.store_create = Library.lookup(dylib, "indexstore_store_create")
api.store_get_unit_name_from_output_path = Library.lookup(dylib, "indexstore_store_get_unit_name_from_output_path")
api.unit_reader_create = Library.lookup(dylib, "indexstore_unit_reader_create")
Expand Down
Loading