Merge pull request #46 from oxinabox/ox/speed

Swap in LittleDict

Author: oxinabox

Project.toml

@@ -12,8 +12,8 @@ Revise = "295af30f-e4ad-537b-8983-00126c2a3abe"
 
 [compat]
 CodeTracking = "0.4.0"
+OrderedCollections = "1.1"
 Revise = "2"
-# Revise 1.1 works, except for setting breakpoints on files outside of packages
 
 [extras]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

src/core_control.jl

@@ -23,7 +23,7 @@ parent_stepping_mode(::StepOut) = StepNext()   # This is what they want
 
 
 mutable struct HandEvalMeta
-    variables::OrderedDict{Symbol, Any}
+    variables::LittleDict{Symbol, Any}
     eval_module::Module
     stepping_mode::SteppingMode
     breakpoint_rules::BreakpointRules
@@ -34,7 +34,7 @@ const GLOBAL_BREAKPOINT_RULES = BreakpointRules()
 
 function HandEvalMeta(eval_module, stepping_mode)
     return HandEvalMeta(
-        OrderedDict{Symbol,Any}(),
+        LittleDict{Symbol,Any}(),
         eval_module,
         stepping_mode,
         GLOBAL_BREAKPOINT_RULES
@@ -51,11 +51,10 @@ function Cassette.overdub(::typeof(HandEvalCtx()), args...)
 end
 
 
-function Cassette.overdub(ctx::HandEvalCtx, f, args...)
+function Cassette.overdub(ctx::HandEvalCtx, @nospecialize(f), @nospecialize(args...))
     # This is basically the epicenter of all the logic
     # We control the flow of stepping modes
     # and which methods are instrumented or not.
-    @debug "overdubbing" f args
     method = methodof(f, args...)
     should_recurse =
         ctx.metadata.stepping_mode isa StepIn ||

src/method_utils.jl

@@ -4,7 +4,7 @@ functiontypeof(m::Method) = parameter_typeof(m.sig)[1]
 parameter_typeof(sig::UnionAll) = parameter_typeof(sig.body)
 parameter_typeof(sig::DataType) = sig.parameters
 
-function methodof(f, args...)
+function methodof(@nospecialize(f), @nospecialize(args...))
     try
         @which(f(args...))
     catch