tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid setting up unnecessary stack frames for dictionary expressions

This commit is contained in:
Gunnar Beutner 2015-03-31 12:37:31 +02:00
parent a28369593a
commit 1c7e7dac60
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/config/expression.cpp
View File

@ -441,29 +441,32 @@ ExpressionResult ArrayExpression::DoEvaluate(ScriptFrame& frame, DebugHint *dhin
ExpressionResult DictExpression::DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const ExpressionResult DictExpression::DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const
{ {
ScriptFrame *dframe; Value self;
ScriptFrame rframe;
if (!m_Inline) { if (!m_Inline) {
dframe = &rframe; self = frame.Self;
rframe.Locals = frame.Locals; frame.Self = new Dictionary();
rframe.Self = new Dictionary();
} else {
dframe = &frame;
} }
Value result; Value result;
BOOST_FOREACH(Expression *aexpr, m_Expressions) { try {
ExpressionResult element = aexpr->Evaluate(*dframe, dhint); BOOST_FOREACH(Expression *aexpr, m_Expressions) {
CHECK_RESULT(element); ExpressionResult element = aexpr->Evaluate(frame, dhint);
result = element.GetValue(); CHECK_RESULT(element);
result = element.GetValue();
}
} catch (...) {
std::swap(self, frame.Self);
throw;
} }
if (m_Inline) if (m_Inline)
return result; return result;
else else {
return dframe->Self; std::swap(self, frame.Self);
return self;
}
} }
ExpressionResult GetScopeExpression::DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const ExpressionResult GetScopeExpression::DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const