do not catch everything in isassigned

(cherry picked from commit bc0348e) ref #18075
JuliaLang · Aug 21, 2016 · 2082241 · 2082241
1 parent 9e1dbfd
commit 2082241
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/base/abstractarray.jl b/base/abstractarray.jl
@@ -182,12 +182,15 @@ function _strides{M,T,N}(out::NTuple{M}, A::AbstractArray{T,N})
 end
 
 function isassigned(a::AbstractArray, i::Int...)
-    # TODO
     try
         a[i...]
         true
-    catch
-        false
+    catch e
+        if isa(e, BoundsError) || isa(e, UndefRefError)
+            return false
+        else
+            rethrow(e)
+        end
     end
 end
 

diff --git a/test/abstractarray.jl b/test/abstractarray.jl
@@ -408,6 +408,13 @@ function test_primitives{T}(::Type{T}, shape, ::Type{TestAbstractArray})
     @test convert(Array, X) == X
 end
 
+let
+    type TestThrowNoGetindex{T} <: AbstractVector{T} end
+    Base.length(::TestThrowNoGetindex) = 2
+    Base.size(::TestThrowNoGetindex) = (2,)
+    @test_throws ErrorException isassigned(TestThrowNoGetindex{Float64}(), 1)
+end
+
 function test_in_bounds(::Type{TestAbstractArray})
     n = rand(2:5)
     sz = rand(2:5, n)