From eafe4c578dc477fdcbc51fb2062d4611a73cf8d3 Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Sat, 27 Aug 2016 18:43:14 +0200
Subject: [PATCH] Avoid unnecessary copies for the DebugHint class

refs #12509
---
 lib/base/array.hpp        |  4 +++
 lib/config/expression.cpp |  1 +
 lib/config/expression.hpp | 66 ++++++++++++++++++++-------------------
 3 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/lib/base/array.hpp b/lib/base/array.hpp
index 5016d66b0..a6866d3cf 100644
--- a/lib/base/array.hpp
+++ b/lib/base/array.hpp
@@ -50,6 +50,10 @@ public:
 	inline Array(void)
 	{ }
 
+	inline Array(std::initializer_list<Value> init)
+	    : m_Data(init)
+	{ }
+
 	inline ~Array(void)
 	{ }
 
diff --git a/lib/config/expression.cpp b/lib/config/expression.cpp
index 41235476f..392db1d6d 100644
--- a/lib/config/expression.cpp
+++ b/lib/config/expression.cpp
@@ -460,6 +460,7 @@ ExpressionResult FunctionCallExpression::DoEvaluate(ScriptFrame& frame, DebugHin
 ExpressionResult ArrayExpression::DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const
 {
 	Array::Ptr result = new Array();
+	result->Reserve(m_Expressions.size());
 
 	for (Expression *aexpr : m_Expressions) {
 		ExpressionResult element = aexpr->Evaluate(frame);
diff --git a/lib/config/expression.hpp b/lib/config/expression.hpp
index 5c35c2ad7..84cf464c7 100644
--- a/lib/config/expression.hpp
+++ b/lib/config/expression.hpp
@@ -41,37 +41,29 @@ public:
 		: m_Hints(hints)
 	{ }
 
+	DebugHint(Dictionary::Ptr&& hints)
+	    : m_Hints(std::move(hints))
+	{ }
+
 	inline void AddMessage(const String& message, const DebugInfo& di)
 	{
-		Array::Ptr amsg = new Array();
-
-		{
-			ObjectLock olock(amsg);
-
-			amsg->Reserve(6);
-			amsg->Add(message);
-			amsg->Add(di.Path);
-			amsg->Add(di.FirstLine);
-			amsg->Add(di.FirstColumn);
-			amsg->Add(di.LastLine);
-			amsg->Add(di.LastColumn);
-		}
-
-		GetMessages()->Add(amsg);
+		GetMessages()->Add(new Array({ message, di.Path, di.FirstLine, di.FirstColumn, di.LastLine, di.LastColumn }));
 	}
 
 	inline DebugHint GetChild(const String& name)
 	{
-		Dictionary::Ptr children = GetChildren();
+		const Dictionary::Ptr& children = GetChildren();
 
 		Value vchild;
+		Dictionary::Ptr child;
 
 		if (!children->Get(name, &vchild)) {
-			vchild = new Dictionary();
-			children->Set(name, vchild);
-		}
+			child = new Dictionary();
+			children->Set(name, child);
+		} else
+			child = vchild;
 
-		return DebugHint(vchild);
+		return DebugHint(child);
 	}
 
 	Dictionary::Ptr ToDictionary(void) const
@@ -81,35 +73,45 @@ public:
 
 private:
 	Dictionary::Ptr m_Hints;
+	Array::Ptr m_Messages;
+	Dictionary::Ptr m_Children;
 
-	Array::Ptr GetMessages(void)
+	const Array::Ptr& GetMessages(void)
 	{
+		if (m_Messages)
+			return m_Messages;
+
 		if (!m_Hints)
 			m_Hints = new Dictionary();
 
 		Value vmessages;
 
 		if (!m_Hints->Get("messages", &vmessages)) {
-			vmessages = new Array();
-			m_Hints->Set("messages", vmessages);
-		}
+			m_Messages = new Array();
+			m_Hints->Set("messages", m_Messages);
+		} else
+			m_Messages = vmessages;
 
-		return vmessages;
+		return m_Messages;
 	}
 
-	Dictionary::Ptr GetChildren(void)
+	const Dictionary::Ptr& GetChildren(void)
 	{
+		if (m_Children)
+			return m_Children;
+
 		if (!m_Hints)
 			m_Hints = new Dictionary();
 
 		Value vchildren;
 
 		if (!m_Hints->Get("properties", &vchildren)) {
-			vchildren = new Dictionary();
-			m_Hints->Set("properties", vchildren);
-		}
+			m_Children = new Dictionary();
+			m_Hints->Set("properties", m_Children);
+		} else
+			m_Children = vchildren;
 
-		return vchildren;
+		return m_Children;
 	}
 };
 
@@ -157,12 +159,12 @@ public:
 	    : m_Value(value), m_Code(code)
 	{ }
 
-	operator Value(void) const
+	operator const Value&(void) const
 	{
 		return m_Value;
 	}
 
-	Value GetValue(void) const
+	const Value& GetValue(void) const
 	{
 		return m_Value;
 	}
-- 
2.40.0