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

Author: owenv

Sources/SWBCSupport/IndexStore.h

@@ -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

Sources/SWBUtil/Cache.swift

@@ -87,13 +87,21 @@ public final class Cache<Key: Hashable, Value>: NSObject, KeyValueStorage, NSCac
             return nil
         }
         set {
+            #if os(Linux)
+            if let newValue = newValue {
+                cache.value.setObject(ValueWrapper(newValue), forKey: KeyWrapper(key))
+            } else {
+                cache.value.removeObject(forKey: KeyWrapper(key))
+            }
+            #else
             if let newValue, let cacheableValue = newValue as? (any CacheableValue) {
                 cache.value.setObject(ValueWrapper(newValue), forKey: KeyWrapper(key), cost: cacheableValue.cost)
             } else if let newValue = newValue {
                 cache.value.setObject(ValueWrapper(newValue), forKey: KeyWrapper(key))
             } else {
                 cache.value.removeObject(forKey: KeyWrapper(key))
             }
+            #endif
         }
     }
 
@@ -112,12 +120,16 @@ public final class Cache<Key: Hashable, Value>: NSObject, KeyValueStorage, NSCac
         }
 
         let value = try body()
+        #if os(Linux)
+        cache.value.setObject(ValueWrapper(value), forKey: wrappedKey)
+        #else
         if let cacheableValue = value as? (any CacheableValue) {
             cache.value.setObject(ValueWrapper(value), forKey: wrappedKey, cost: cacheableValue.cost)
 
         } else {
             cache.value.setObject(ValueWrapper(value), forKey: wrappedKey)
         }
+        #endif
         return value
     }
 

Sources/SWBUtil/IndexStore.swift

@@ -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
@@ -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")