Whitespace, fix copy in BoundsError contstructor

JuliaLang · Oct 25, 2021 · a22d32a · a22d32a
1 parent e5e9e90
commit a22d32a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/base/boot.jl b/base/boot.jl
@@ -279,12 +279,19 @@ struct BoundsError <: Exception
     a::Any
     i::Any
     BoundsError() = new()
-    # For now, copy to avoid escaping a
+    # For now, always* copy to avoid escaping a
     # Eventually, we want to figure out if the copy is needed to save the performance of copying
+
+    # * to avoid throwing a MethodError and breaking many test suites, first check if copy is defined for a
+
     #BoundsError(@nospecialize(a)) = (@_noinline_meta; new(a))
-    BoundsError(@nospecialize(a)) = (@_noinline_meta; new(Array(a)))
+    BoundsError(@nospecialize(a)) = Main.Base.hasmethod(Main.Base.copy, Tuple{typeof(a)}) ?
+                                    (@_noinline_meta; new(Main.Base.copy(a))) :
+                                    (@_noinline_meta; new(a))
     #BoundsError(@nospecialize(a), i) = (@_noinline_meta; new(a, i))
-    BoundsError(@nospecialize(a), i) = (@_noinline_meta; new(Array(a), i))
+    BoundsError(@nospecialize(a), i) = Main.Base.hasmethod(Main.Base.copy, Tuple{typeof(a)}) ?
+                                       (@_noinline_meta; new(Main.Base.copy(a), i)) :
+                                       (@_noinline_meta; new(a, i))
 end
 
 struct DivideError         <: Exception end

diff --git a/base/compiler/ssair/passes.jl b/base/compiler/ssair/passes.jl
@@ -1284,7 +1284,7 @@ end
 function memory_opt!(ir::IRCode)
     compact = IncrementalCompact(ir, false)
     uses = IdDict{Int, Vector{Int}}()
-    relevant = IdSet{Int}() # allocations and their sizes
+    relevant = IdSet{Int}() # allocations
     revisit = Int[] # potential targets for a mutating_arrayfreeze drop-in
 
     function mark_escape(@nospecialize val)
@@ -1450,7 +1450,7 @@ function memory_opt!(ir::IRCode)
         #     print(id, " ")
         # end
         # println(" ")
-        # print("Revisit: ") 
+        # print("Revisit: ")
         # Main.Base.show(revisit)
         # println()
         (id in relevant) || continue

diff --git a/test/compiler/immutablearray.jl b/test/compiler/immutablearray.jl
@@ -35,9 +35,9 @@ end
 
 function test_allocate5()
     a = [1,2,3]
-    try 
+    try
         getindex(a, 4)
-    catch end 
+    catch end
     Core.ImmutableArray(a)
 end