Skip to content

Commit 96d73de

Browse files
committed
Remove result coalescing
Trying to coalesce SSA nodes with a result phi node is causing BDD resolution issues. Removing for now.
1 parent 9986fc8 commit 96d73de

6 files changed

Lines changed: 21 additions & 768 deletions

File tree

smithy-rules-engine/src/main/java/software/amazon/smithy/rulesengine/language/evaluation/RuleEvaluator.java

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -137,21 +137,6 @@ public Value evaluateRuleSet(EndpointRuleSet ruleset, Map<Identifier, Value> par
137137
});
138138
}
139139

140-
/**
141-
* Configure the rule evaluator with the given parameters and parameter values for manual evaluation.
142-
*
143-
* @param parameters Parameters of the ruleset to evaluate.
144-
* @param parameterArguments Parameter values to evaluate the ruleset against.
145-
* @return the updated evaluator.
146-
*/
147-
public RuleEvaluator withParameters(Parameters parameters, Map<Identifier, Value> parameterArguments) {
148-
for (Parameter parameter : parameters) {
149-
parameter.getDefault().ifPresent(value -> scope.insert(parameter.getName(), value));
150-
}
151-
parameterArguments.forEach(scope::insert);
152-
return this;
153-
}
154-
155140
/**
156141
* Evaluates the given condition in the current scope.
157142
*
@@ -185,14 +170,13 @@ public Value visitIsSet(Expression fn) {
185170

186171
@Override
187172
public Value visitCoalesce(List<Expression> expressions) {
188-
Value result = Value.emptyValue();
189173
for (Expression exp : expressions) {
190-
result = exp.accept(this);
174+
Value result = exp.accept(this);
191175
if (!result.isEmpty()) {
192176
return result;
193177
}
194178
}
195-
return result;
179+
return Value.emptyValue();
196180
}
197181

198182
@Override

0 commit comments

Comments
 (0)