* Work around problems with the ATerm library.

  The ATerm library doesn't search the heap for pointers to ATerms
  when garbage collecting.  As a result, C++ containers such as
  `map<ATerm, ATerm>' will cause pointer to be hidden from the garbage
  collector, causing crashes.  Instead, we now use ATermTables.

1 files changed, 1 insertions, 2 deletions

diff --git a/src/fix-ng/eval.hh b/src/fix-ng/eval.hh
index 364f28471b79..9be3ae2da073 100644
--- a/src/fix-ng/eval.hh
+++ b/src/fix-ng/eval.hh
@@ -7,13 +7,12 @@
 #include "expr.hh"
 
 
-typedef map<Expr, Expr> NormalForms;
 typedef map<Path, PathSet> DrvPaths;
 typedef map<Path, Hash> DrvHashes;
 
 struct EvalState 
 {
-    NormalForms normalForms;
+    ATermMap normalForms;
     DrvPaths drvPaths;
     DrvHashes drvHashes; /* normalised derivation hashes */
     Expr blackHole;