From 3720e811fa2883bca1a2698543146070e4d8d32c Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Tue, 12 Sep 2023 13:21:55 +0200
Subject: [PATCH 1/3] libexpr: Add nrExprs to NIX_SHOW_STATS

---
 src/libexpr/eval.cc    | 1 +
 src/libexpr/nixexpr.hh | 4 ++++
 src/libexpr/parser.y   | 1 +
 3 files changed, 6 insertions(+)

diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index 6d445fd96..afa864730 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -2506,6 +2506,7 @@ void EvalState::printStats()
             {"elements", nrValuesInEnvs},
             {"bytes", bEnvs},
         };
+        topObj["nrExprs"] = Expr::nrExprs;
         topObj["list"] = {
             {"elements", nrListElems},
             {"bytes", bLists},
diff --git a/src/libexpr/nixexpr.hh b/src/libexpr/nixexpr.hh
index 5ca3d1fa6..b80c07f46 100644
--- a/src/libexpr/nixexpr.hh
+++ b/src/libexpr/nixexpr.hh
@@ -155,6 +155,10 @@ std::string showAttrPath(const SymbolTable & symbols, const AttrPath & attrPath)
 
 struct Expr
 {
+    static unsigned long nrExprs;
+    inline Expr() {
+        nrExprs++;
+    }
     virtual ~Expr() { };
     virtual void show(const SymbolTable & symbols, std::ostream & str) const;
     virtual void bindVars(EvalState & es, const std::shared_ptr<const StaticEnv> & env);
diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y
index 792f51fde..a3d3c7041 100644
--- a/src/libexpr/parser.y
+++ b/src/libexpr/parser.y
@@ -653,6 +653,7 @@ formal
 
 namespace nix {
 
+unsigned long Expr::nrExprs = 0;
 
 Expr * EvalState::parse(
     char * text,

From bf8deb4991286a44e1b6cc2142721a594276dd12 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Tue, 12 Sep 2023 13:45:45 +0200
Subject: [PATCH 2/3] Expr: remove redundant int and float fields

---
 src/libexpr/nixexpr.cc | 4 ++--
 src/libexpr/nixexpr.hh | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/libexpr/nixexpr.cc b/src/libexpr/nixexpr.cc
index 4566a1388..22be8e68c 100644
--- a/src/libexpr/nixexpr.cc
+++ b/src/libexpr/nixexpr.cc
@@ -76,12 +76,12 @@ void Expr::show(const SymbolTable & symbols, std::ostream & str) const
 
 void ExprInt::show(const SymbolTable & symbols, std::ostream & str) const
 {
-    str << n;
+    str << v.integer;
 }
 
 void ExprFloat::show(const SymbolTable & symbols, std::ostream & str) const
 {
-    str << nf;
+    str << v.fpoint;
 }
 
 void ExprString::show(const SymbolTable & symbols, std::ostream & str) const
diff --git a/src/libexpr/nixexpr.hh b/src/libexpr/nixexpr.hh
index b80c07f46..17b2d1136 100644
--- a/src/libexpr/nixexpr.hh
+++ b/src/libexpr/nixexpr.hh
@@ -175,18 +175,16 @@ struct Expr
 
 struct ExprInt : Expr
 {
-    NixInt n;
     Value v;
-    ExprInt(NixInt n) : n(n) { v.mkInt(n); };
+    ExprInt(NixInt n) { v.mkInt(n); };
     Value * maybeThunk(EvalState & state, Env & env) override;
     COMMON_METHODS
 };
 
 struct ExprFloat : Expr
 {
-    NixFloat nf;
     Value v;
-    ExprFloat(NixFloat nf) : nf(nf) { v.mkFloat(nf); };
+    ExprFloat(NixFloat nf) { v.mkFloat(nf); };
     Value * maybeThunk(EvalState & state, Env & env) override;
     COMMON_METHODS
 };

From bd24176ac57b9d418b4ec51448b188cb74b87945 Mon Sep 17 00:00:00 2001
From: Robert Hensing <roberth@users.noreply.github.com>
Date: Mon, 25 Sep 2023 17:51:17 +0100
Subject: [PATCH 3/3] libexpr/nixexpr.hh: Remove redundant inline

This is redundant since definitions in C++ record are implicitly inline-ed.

Co-authored-by: Yingchi Long <i@lyc.dev>
---
 src/libexpr/nixexpr.hh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libexpr/nixexpr.hh b/src/libexpr/nixexpr.hh
index 17b2d1136..5c9242759 100644
--- a/src/libexpr/nixexpr.hh
+++ b/src/libexpr/nixexpr.hh
@@ -156,7 +156,7 @@ std::string showAttrPath(const SymbolTable & symbols, const AttrPath & attrPath)
 struct Expr
 {
     static unsigned long nrExprs;
-    inline Expr() {
+    Expr() {
         nrExprs++;
     }
     virtual ~Expr() { };