Revert ""improve" allocations macro with more functions (#58057)"

This reverts commit a47b58f.

Author: vtjnash

base/timing.jl

@@ -472,35 +472,6 @@ function gc_bytes()
     b[]
 end
 
-function allocated(f, args::Vararg{Any,N}) where {N}
-    b0 = Ref{Int64}(0)
-    b1 = Ref{Int64}(0)
-    Base.gc_bytes(b0)
-    f(args...)
-    Base.gc_bytes(b1)
-    return b1[] - b0[]
-end
-only(methods(allocated)).called = 0xff
-
-function allocations(f, args::Vararg{Any,N}) where {N}
-    stats = Base.gc_num()
-    f(args...)
-    diff = Base.GC_Diff(Base.gc_num(), stats)
-    return Base.gc_alloc_count(diff)
-end
-only(methods(allocations)).called = 0xff
-
-function is_simply_call(@nospecialize ex)
-    Meta.isexpr(ex, :call) || return false
-    for a in ex.args
-        a isa QuoteNode && continue
-        a isa Symbol && continue
-        isa_ast_node(a) || continue
-        return false
-    end
-    return true
-end
-
 """
     @allocated
 
@@ -516,11 +487,15 @@ julia> @allocated rand(10^6)
 ```
 """
 macro allocated(ex)
-    if !is_simply_call(ex)
-        ex = :((() -> $ex)())
+    quote
+        Experimental.@force_compile
+        local b0 = Ref{Int64}(0)
+        local b1 = Ref{Int64}(0)
+        gc_bytes(b0)
+        $(esc(ex))
+        gc_bytes(b1)
+        b1[] - b0[]
     end
-    pushfirst!(ex.args, GlobalRef(Base, :allocated))
-    return esc(ex)
 end
 
 """
@@ -541,14 +516,15 @@ julia> @allocations rand(10^6)
     This macro was added in Julia 1.9.
 """
 macro allocations(ex)
-    if !is_simply_call(ex)
-        ex = :((() -> $ex)())
+    quote
+        Experimental.@force_compile
+        local stats = Base.gc_num()
+        $(esc(ex))
+        local diff = Base.GC_Diff(Base.gc_num(), stats)
+        Base.gc_alloc_count(diff)
     end
-    pushfirst!(ex.args, GlobalRef(Base, :allocations))
-    return esc(ex)
 end
 
-
 """
     @lock_conflicts
 

stdlib/Unicode/test/runtests.jl

@@ -285,7 +285,7 @@ end
     @test_throws BoundsError graphemes("äöüx", 5:5)
     @test_throws ArgumentError graphemes("äöüx", 0:1)
 
-    @test @allocated(length(graphemes("äöüx"))) == 0
+    @test (()->@allocated(length(graphemes("äöüx"))))() == 0
 end
 
 @testset "#3721, #6939 up-to-date character widths" begin

test/boundscheck_exec.jl

@@ -350,7 +350,7 @@ if bc_opt == bc_default
         m1 === m2
     end
     no_alias_prove(1)
-    @test (@allocated no_alias_prove(5)) == 0
+    @test_broken (@allocated no_alias_prove(5)) == 0
 end
 
 @testset "automatic boundscheck elision for iteration on some important types" begin