Enhance inference for methods extended in BinaryPlatforms (#3020)

* Use Union in BinaryPlatform calls to enhance inference

With MAX_METHODS=3, the former implementation got in the
way of successful abstract inference. This implementation
fares better.

Co-authored-by: Elliot Saba <[email protected]>

* Inference improvement in TOML-Dict call

Author: timholy

src/BinaryPlatforms_compat.jl

@@ -60,33 +60,35 @@ for T in (:Linux, :Windows, :MacOS, :FreeBSD)
             end
         end
     end
+end
 
-    # First, methods we need to coerce to Symbol for backwards-compatibility
-    for f in (:arch, :libc, :call_abi, :cxxstring_abi)
-        @eval begin
-            function $(f)(p::$(T))
-                str = $(f)(p.p)
-                if str === nothing
-                    return nothing
-                end
-                return Symbol(str)
-            end
-        end
-    end
+const PlatformUnion = Union{Linux,MacOS,Windows,FreeBSD}
 
-    # Next, things we don't need to coerce
-    for f in (:libgfortran_version, :libstdcxx_version, :platform_name, :wordsize, :platform_dlext, :tags, :triplet)
-        @eval begin
-            $(f)(p::$(T)) = $(f)(p.p)
+# First, methods we need to coerce to Symbol for backwards-compatibility
+for f in (:arch, :libc, :call_abi, :cxxstring_abi)
+    @eval begin
+        function $(f)(p::PlatformUnion)
+            str = $(f)(p.p)
+            if str === nothing
+                return nothing
+            end
+            return Symbol(str)
         end
     end
+end
 
-    # Finally, add equality testing between these wrapper types and other AbstractPlatforms
+# Next, things we don't need to coerce
+for f in (:libgfortran_version, :libstdcxx_version, :platform_name, :wordsize, :platform_dlext, :tags, :triplet)
     @eval begin
-        Base.:(==)(a::$(T), b::AbstractPlatform) = b == a.p
+        $(f)(p::PlatformUnion) = $(f)(p.p)
     end
 end
 
+# Finally, add equality testing between these wrapper types and other AbstractPlatforms
+@eval begin
+    Base.:(==)(a::PlatformUnion, b::AbstractPlatform) = b == a.p
+end
+
 # Add one-off functions
 MacOS(; kwargs...) = MacOS(:x86_64; kwargs...)
 FreeBSD(; kwargs...) = FreeBSD(:x86_64; kwargs...)

src/Registry/registry_instance.jl

@@ -330,7 +330,7 @@ function verify_compressed_registry_toml(path::String)
             return false
         end
     end
-    compressed_file = joinpath(dirname(path), d["path"])
+    compressed_file = joinpath(dirname(path), convert(String, d["path"])::String)
     if !isfile(compressed_file)
         @warn "Expected the compressed registry for $(repr(path)) to exist at $(repr(compressed_file))"
         return false