Add @inline for do blocks

base/expr.jl

@@ -273,12 +273,11 @@ function pushmeta!(ex::Expr, sym::Symbol, args::Any...)
         inner = inner.args[end]::Expr
     end
 
-    idx, exargs = findmeta(inner)
-    if idx != 0
-        push!(exargs[idx].args, tag)
+    found, metaargs = findmeta(inner)
+    if found
+        push!(metaargs, tag)
     else
-        body::Expr = inner.args[2]
-        pushfirst!(body.args, Expr(:meta, tag))
+        pushfirst!(metaargs, Expr(:meta, tag))
     end
     ex
 end
@@ -335,13 +334,18 @@ function findmeta(ex::Expr)
     if ex.head === :function || is_short_function_def(ex) || ex.head === :->
         body::Expr = ex.args[2]
         body.head === :block || error(body, " is not a block expression")
-        return findmeta_block(ex.args)
+        idx, exargs = findmeta_block(ex.args)
+        if idx != 0
+            return true, exargs[idx].args
+        else
+            return false, ex.args[2].args
+        end
+    elseif ex.head === :do
+        return findmeta(ex.args[2])
     end
     error(ex, " is not a function expression")
 end
 
-findmeta(ex::Array{Any,1}) = findmeta_block(ex)
-
 function findmeta_block(exargs, argsmatch=args->true)
     for i = 1:length(exargs)
         a = exargs[i]

test/compiler/inline.jl

@@ -281,4 +281,6 @@ end
     @test !ccall(:jl_ast_flag_inlineable, Bool, (Any,), first(methods( x -> x)).source)
     @test ccall(:jl_ast_flag_inlineable, Bool, (Any,), first(methods(@inline function f(x) x end)).source)
     @test !ccall(:jl_ast_flag_inlineable, Bool, (Any,), first(methods(function f(x) x end)).source)
+    @test ccall(:jl_ast_flag_inlineable, Bool, (Any,), first(methods(@inline identity() do x; x end)).source)
+    @test !ccall(:jl_ast_flag_inlineable, Bool, (Any,), first(methods(identity() do x; x end)).source)
 end

test/meta.jl

@@ -96,7 +96,7 @@ end
 for m in [:foo1, :foo2, :foo3, :foo4, :foo5]
     @test popmeta!(multi_meta, m)[1]
 end
-@test Base.findmeta(multi_meta.args)[1] == 0
+@test Base.findmeta_block(multi_meta.args)[1] == 0
 
 # Test that pushmeta! can push across other macros,
 # in the case multiple pushmeta!-based macros are combined