Bound number of ambiguous methods in stdlib

see #27408
JuliaLang · Aug 22, 2018 · e7ff79a · e7ff79a
1 parent 81b04cf
commit e7ff79a
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 32 deletions.
diff --git a/base/sysimg.jl b/base/sysimg.jl
@@ -480,6 +480,39 @@ end
 
 const tot_time_stdlib = RefValue(0.0)
 
+# Stdlibs manually sorted in top down order
+const _stdlibs = [
+    # No deps
+    :Base64,
+    :CRC32c,
+    :SHA,
+    :FileWatching,
+    :Unicode,
+    :Mmap,
+    :Serialization,
+    :Libdl,
+    :Markdown,
+    :LibGit2,
+    :Logging,
+    :Sockets,
+    :Printf,
+    :Profile,
+    :Dates,
+    :DelimitedFiles,
+    :Random,
+    :UUIDs,
+    :Future,
+    :LinearAlgebra,
+    :SparseArrays,
+    :SuiteSparse,
+    :Distributed,
+    :SharedArrays,
+    :Pkg,
+    :Test,
+    :REPL,
+    :Statistics,
+]
+
 end # baremodule Base
 
 using .Base
@@ -490,38 +523,7 @@ pushfirst!(Base._included_files, (@__MODULE__, joinpath(@__DIR__, "sysimg.jl")))
 if Base.is_primary_base_module
 # load some stdlib packages but don't put their names in Main
 let
-    # Stdlibs manually sorted in top down order
-    stdlibs = [
-            # No deps
-            :Base64,
-            :CRC32c,
-            :SHA,
-            :FileWatching,
-            :Unicode,
-            :Mmap,
-            :Serialization,
-            :Libdl,
-            :Markdown,
-            :LibGit2,
-            :Logging,
-            :Sockets,
-            :Printf,
-            :Profile,
-            :Dates,
-            :DelimitedFiles,
-            :Random,
-            :UUIDs,
-            :Future,
-            :LinearAlgebra,
-            :SparseArrays,
-            :SuiteSparse,
-            :Distributed,
-            :SharedArrays,
-            :Pkg,
-            :Test,
-            :REPL,
-            :Statistics,
-        ]
+    stdlibs = Base._stdlibs
 
     maxlen = maximum(textwidth.(string.(stdlibs)))
 

diff --git a/test/ambiguous.jl b/test/ambiguous.jl
@@ -157,6 +157,27 @@ ambs = detect_ambiguities(Ambig5)
 # some ambiguities involving Union{} type parameters are expected, but not required
 @test !isempty(detect_ambiguities(Core, Base; imported=true, ambiguous_bottom=true))
 
+module AmbigStdlib
+using Test
+
+for lib in Base._stdlibs
+    @eval import $lib
+end
+
+modules = @eval [$(Base._stdlibs...)]
+
+import InteractiveUtils
+push!(modules, InteractiveUtils)
+
+# At the moment, there are some method ambiguities in stdlibs.  We
+# impose a bound to the number of detected ambiguities to avoid
+# introducing more ambiguities.
+# https://github.com/JuliaLang/julia/issues/27408
+@test length(detect_ambiguities(modules...; imported=true, recursive=true)) ≤ 2
+
+@test_broken detect_ambiguities(modules...; imported=true, recursive=true) == []
+end  # module
+
 amb_1(::Int8, ::Int) = 1
 amb_1(::Integer, x) = 2
 amb_1(x, ::Int) = 3