Merge pull request #389 from reflex-frp/fix-profiled-infinite-recursi…

…on-for-merge-incremental Fix Reflex.Profiled infinite recursion for merge incremental
reflex-frp · Feb 5, 2020 · 4491490 · 4491490
2 parents fc801a8 + f2e34d4
commit 4491490
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,5 +1,13 @@
 # Revision history for reflex
 
+## 0.6.5
+
+* Fix a bug in the Reflex Profiled transformer where
+  `Reflex.Class.mergeIncrementalG` and
+  `Reflex.Class.mergeIncrementalWithMoveG` implementations referenced
+  itself instead of the inner transformed timeline, causing an
+  infinite loop.
+
 ## 0.6.4
 
 * Support GHC 8.8

diff --git a/src/Reflex/Profiled.hs b/src/Reflex/Profiled.hs
@@ -147,8 +147,8 @@ instance Reflex t => Reflex (ProfiledTimeline t) where
   updated (Dynamic_Profiled d) = coerce $ profileEvent $ updated d
   unsafeBuildDynamic (ProfiledM a0) (Event_Profiled a') = coerce $ unsafeBuildDynamic a0 a'
   unsafeBuildIncremental (ProfiledM a0) (Event_Profiled a') = coerce $ unsafeBuildIncremental a0 a'
-  mergeIncrementalG nt = (Event_Profiled . coerce) #. mergeIncrementalG nt
-  mergeIncrementalWithMoveG nt = (Event_Profiled . coerce) #. mergeIncrementalWithMoveG nt
+  mergeIncrementalG nt res = Event_Profiled $ mergeIncrementalG (coerce nt) (coerce res)
+  mergeIncrementalWithMoveG nt res = Event_Profiled $ mergeIncrementalWithMoveG (coerce nt) (coerce res)
   currentIncremental (Incremental_Profiled i) = coerce $ currentIncremental i
   updatedIncremental (Incremental_Profiled i) = coerce $ profileEvent $ updatedIncremental i
   incrementalToDynamic (Incremental_Profiled i) = coerce $ incrementalToDynamic i