Merge branch 'master' into ib/loading_debug

Author: IanButterworth

base/boot.jl

@@ -516,6 +516,30 @@ struct VecElement{T}
 end
 VecElement(arg::T) where {T} = VecElement{T}(arg)
 
+# inference lattice element types (moved from jltypes.c)
+struct Const
+    val
+end
+
+struct PartialStruct
+    typ
+    undefs
+    fields::Array{Any, 1}
+end
+
+struct InterConditional
+    slot::Int
+    thentype
+    elsetype
+end
+
+struct PartialOpaque
+    typ::Type
+    env
+    parent::MethodInstance
+    source
+end
+
 eval(Core, quote
     GotoNode(label::Int) = $(Expr(:new, :GotoNode, :label))
     NewvarNode(slot::SlotNumber) = $(Expr(:new, :NewvarNode, :slot))

base/strings/substring.jl

@@ -109,8 +109,8 @@ function isvalid(s::SubString, i::Integer)
     @inbounds return ib && isvalid(s.string, s.offset + i)::Bool
 end
 
-thisind(s::SubString{String}, i::Int) = _thisind_str(s, i)
-nextind(s::SubString{String}, i::Int) = _nextind_str(s, i)
+@propagate_inbounds thisind(s::SubString{String}, i::Int) = _thisind_str(s, i)
+@propagate_inbounds nextind(s::SubString{String}, i::Int) = _nextind_str(s, i)
 
 parent(s::SubString) = s.string
 parentindices(s::SubString) = (s.offset + 1 : thisind(s.string, s.offset + s.ncodeunits),)

deps/checksums/JuliaSyntaxHighlighting-2817dbaba2a4abaad91a5ad754558840d95ccf2e.tar.gz/md5

@@ -0,0 +1 @@
+96c4535bb47d6bb6c779e42ae011abbc

deps/checksums/JuliaSyntaxHighlighting-2817dbaba2a4abaad91a5ad754558840d95ccf2e.tar.gz/sha512

@@ -0,0 +1 @@
+f2afdb1f0da6b2e5bd21c368e005921f77f7726bca1caac62699563e5d1e110aa08f709156fda2456885b4fe37f9864ccffd87d39a52602da1fb04a39dd7ca67

deps/checksums/JuliaSyntaxHighlighting-84fb1fd08824736de14aaa94265df756474e0bdf.tar.gz/md5

@@ -0,0 +1 @@
+de32e20dce88650db906b149eda6854b

deps/checksums/JuliaSyntaxHighlighting-84fb1fd08824736de14aaa94265df756474e0bdf.tar.gz/sha512

@@ -0,0 +1 @@
+90a6af3cebea0cd01c2b76ad3d70c578cba478f1665e07c66a27d3e91c7c3ceb37d07ea2fc791252d28735aef4a6f1ac86f350058ebb391d79e7a19ee149b639