From 7e604f716cd3a4bcd47407bda27874262212dcbc Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Sun, 14 Jul 2024 12:19:55 +0200
Subject: [PATCH] concatStrings: Give compiler access to definition for
 inlining

... at call sites that are may be in the hot path.

I do not know how clever the compiler gets at these sites.
My primary concern is to not regress performance and I am confident
that this achieves it the easy way.
---
 src/libexpr/eval.cc         | 2 ++
 src/libexpr/nixexpr.cc      | 2 ++
 src/libstore/derivations.cc | 2 ++
 src/libutil/canon-path.cc   | 1 +
 src/libutil/file-system.cc  | 2 ++
 5 files changed, 9 insertions(+)

diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index 2ede55de7b6..a4cf2e8c85d 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -49,6 +49,8 @@
 
 #endif
 
+#include "strings-inline.hh"
+
 using json = nlohmann::json;
 
 namespace nix {
diff --git a/src/libexpr/nixexpr.cc b/src/libexpr/nixexpr.cc
index 81638916550..c1ffe3435e8 100644
--- a/src/libexpr/nixexpr.cc
+++ b/src/libexpr/nixexpr.cc
@@ -7,6 +7,8 @@
 #include <cstdlib>
 #include <sstream>
 
+#include "strings-inline.hh"
+
 namespace nix {
 
 unsigned long Expr::nrExprs = 0;
diff --git a/src/libstore/derivations.cc b/src/libstore/derivations.cc
index 6dfcc408c33..8f9c7185168 100644
--- a/src/libstore/derivations.cc
+++ b/src/libstore/derivations.cc
@@ -10,6 +10,8 @@
 #include <boost/container/small_vector.hpp>
 #include <nlohmann/json.hpp>
 
+#include "strings-inline.hh"
+
 namespace nix {
 
 std::optional<StorePath> DerivationOutput::path(const StoreDirConfig & store, std::string_view drvName, OutputNameView outputName) const
diff --git a/src/libutil/canon-path.cc b/src/libutil/canon-path.cc
index 27f048697e5..03db6378a82 100644
--- a/src/libutil/canon-path.cc
+++ b/src/libutil/canon-path.cc
@@ -1,6 +1,7 @@
 #include "canon-path.hh"
 #include "util.hh"
 #include "file-path-impl.hh"
+#include "strings-inline.hh"
 
 namespace nix {
 
diff --git a/src/libutil/file-system.cc b/src/libutil/file-system.cc
index f75851bbd58..9042e3a5e67 100644
--- a/src/libutil/file-system.cc
+++ b/src/libutil/file-system.cc
@@ -23,6 +23,8 @@
 # include <io.h>
 #endif
 
+#include "strings-inline.hh"
+
 namespace fs = std::filesystem;
 
 namespace nix {