disable apply iterate handling

.travis.yml

@@ -7,6 +7,7 @@ julia:
  - 1.1
  - 1.2
  - 1.3
+ - 1.4
  - nightly
 matrix:
  allow_failures:

src/context.jl

@@ -258,12 +258,6 @@ macro context(_Ctx)
  @inline Cassette.overdub(::C, ::Typeof(Tag), ::Type{N}, ::Type{X}) where {C<:$Ctx,N,X} = Tag(N, X, tagtype(C))
 
  @inline Cassette.overdub(ctx::$Ctx, ::typeof(Core._apply), f, args...) = Core._apply(overdub, (ctx, f), args...)
- if VERSION >= v"1.4.0-DEV.304"
- @inline function Cassette.overdub(ctx::$Ctx, ::typeof(Core._apply_iterate), f, args...)
- new_args = ((_args...) -> overdub(ctx, args[1], _args...), Base.tail(args)...)
- Core._apply_iterate((args...)->overdub(ctx, f, args...), new_args...)
- end
- end
 
  # TODO: There are certain non-`Core.Builtin` functions which the compiler often
  # relies upon constant propagation/tfuncs to infer, instead of specializing on

src/overdub.jl

@@ -522,12 +522,6 @@ function overdub end
 function recurse end
 
 recurse(ctx::Context, ::typeof(Core._apply), f, args...) = Core._apply(recurse, (ctx, f), args...)
-if VERSION >= v"1.4.0-DEV.304"
- function recurse(ctx::Context, ::typeof(Core._apply_iterate), f, args...)
- new_args = ((_args...) -> overdub(ctx, args[1], _args...), Base.tail(args)...)
- Core._apply_iterate((args...)->recurse(ctx, f, args...), new_args...)
- end
-end
 
 function overdub_definition(line, file)
  return quote

test/misctaggingtests.jl

@@ -465,9 +465,15 @@ Cassette.overdub(ctx::DiffCtx, ::typeof(+), x, y, z) = Cassette.overdub(ctx, +,
 @test D(sin, 1) === cos(1)
 @test D(x -> D(sin, x), 1) === -sin(1)
 @test D(x -> sin(x) * cos(x), 1) === cos(1)^2 - sin(1)^2
-@test D(x -> x * D(y -> x * y, 1), 2) === 4
-@test D(x -> x * D(y -> x * y, 2), 1) === 2
-@test D(x -> x * D(y -> 5*x*y, 3), 2) === 20
+if VERSION < v"1.4"
+ @test D(x -> x * D(y -> x * y, 1), 2) === 4
+ @test D(x -> x * D(y -> x * y, 2), 1) === 2
+ @test D(x -> x * D(y -> 5*x*y, 3), 2) === 20
+else
+ @test_broken D(x -> x * D(y -> x * y, 1), 2) === 4
+ @test_broken D(x -> x * D(y -> x * y, 2), 1) === 2
+ @test_broken D(x -> x * D(y -> 5*x*y, 3), 2) === 20
+end
 @test D(x -> x * foo_bar_identity(x), 1) === 2.0
 
 x = rand()
@@ -493,6 +499,10 @@ ctx = enabletagging(ArrayIndexCtx(), matrixliteral)
 result = overdub(ctx, matrixliteral, tag(1, ctx, "hi"))
 
 @test untag(result, ctx) == matrixliteral(1)
-@test metameta(result, ctx) == fill(Cassette.Meta("hi", Cassette.NoMetaMeta()), 2, 2)
+if VERSION < v"1.4"
+ @test metameta(result, ctx) == fill(Cassette.Meta("hi", Cassette.NoMetaMeta()), 2, 2)
+else
+ @test_broken metameta(result, ctx) == fill(Cassette.Meta("hi", Cassette.NoMetaMeta()), 2, 2)
+end
 
 println("done (took ", time() - before_time, " seconds)")

test/misctests.jl

@@ -294,7 +294,11 @@ end
 tracekw = Any[]
 @overdub(TraceCtx(metadata = tracekw), trkwtest(x, _y = y, _z = z)) == trtest(x, y, z)
 subtracekw = first(Iterators.filter(t -> t[1] === (Core.kwfunc(trkwtest), (_y = y, _z = z), trkwtest, x), tracekw))[2]
-@test subtracekw == trace
+if VERSION < v"1.4"
+ @test subtracekw == trace
+else
+ @test_broken subtracekw == trace
+end
 
 function enter!(t::HookTrace, args...)
  pair = args => Any[]
@@ -509,8 +513,13 @@ if VERSION >= v"1.1-"
  ff73(2, 50) # warm up
  fff73(2, 50) # warm up
 
+if VERSION < v"1.4"
  @test @allocated(f73(2, 50)) == 0
  @test @allocated(ff73(2, 50)) == 0
+else
+ @test_broken @allocated(f73(2, 50)) == 0
+ @test_broken @allocated(ff73(2, 50)) == 0
+end
  @test_broken @allocated(fff73(2, 50)) == 0
 
  println("done (took ", time() - before_time, " seconds)")
@@ -699,11 +708,11 @@ end
 
 launch(s::Silo) = (s...,)
 
-if VERSION >= v"1.4.0-DEV.304"
- @test Cassette.overdub(NukeContext(), launch, Silo()) === ()
-else
+# if VERSION >= v"1.4.0-DEV.304"
+#  @test Cassette.overdub(NukeContext(), launch, Silo()) === ()
+# else
  @test_broken Cassette.overdub(NukeContext(), launch, Silo()) === ()
-end
+# end
 
 if VERSION >= v"1.4.0-DEV.304"
  Cassette.@context ApplyIterateCtx;
@@ -716,5 +725,5 @@ if VERSION >= v"1.4.0-DEV.304"
  end
 
  Cassette.overdub(ApplyIterateCtx(), ()->pi*2.0)
- @test instructions[end] === (Core.Intrinsics.mul_float, Float64, Float64)
+ @test_broken instructions[end] === (Core.Intrinsics.mul_float, Float64, Float64)
 end