Fix merge

An incompatibility between #440 and #438 was not caught until after merging both to the main branch.
hashicorp · Jan 6, 2021 · 6eb7705 · 6eb7705
1 parent 0cdbaf8
commit 6eb7705
Showing 1 changed file with 2 additions and 14 deletions.
diff --git a/hclsyntax/expression.go b/hclsyntax/expression.go
@@ -1139,13 +1139,7 @@ func (e *ForExpr) Value(ctx *hcl.EvalContext) (cty.Value, hcl.Diagnostics) {
 				// Extract and merge marks from the include expression into the
 				// main set of marks
 				includeUnmarked, includeMarks := include.Unmark()
-				if marks == nil {
-					marks = includeMarks
-				} else {
-					for k := range includeMarks {
-						marks[k] = struct{}{}
-					}
-				}
+				marks = append(marks, includeMarks)
 				if includeUnmarked.False() {
 					// Skip this element
 					continue
@@ -1296,13 +1290,7 @@ func (e *ForExpr) Value(ctx *hcl.EvalContext) (cty.Value, hcl.Diagnostics) {
 				// Extract and merge marks from the include expression into the
 				// main set of marks
 				includeUnmarked, includeMarks := include.Unmark()
-				if marks == nil {
-					marks = includeMarks
-				} else {
-					for k := range includeMarks {
-						marks[k] = struct{}{}
-					}
-				}
+				marks = append(marks, includeMarks)
 				if includeUnmarked.False() {
 					// Skip this element
 					continue