tools/trim: prevent nil-pointer panic

Fixes #1087 Change-Id: I471969c6f75361e39f706083eb23a0b005be92ad Signed-off-by: Marcel van Lohuizen <[email protected]> Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/532314 Unity-Result: CUEcueckoo <[email protected]> TryBot-Result: CUEcueckoo <[email protected]> Reviewed-by: Marcel van Lohuizen <[email protected]>
cue-lang · Feb 1, 2022 · 6bc922c · 6bc922c
1 parent 9aeaf70
commit 6bc922c
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/tools/trim/testdata/issue1087.txtar b/tools/trim/testdata/issue1087.txtar
@@ -0,0 +1,28 @@
+#Issue: 1087
+-- in.cue --
+configs: {
+	key: 123
+}
+
+shared: {
+	param: string
+	derived: configs[param]
+}
+
+a: shared & {
+	param: "key"
+}
+-- out/trim --
+== in.cue
+configs: {
+	key: 123
+}
+
+shared: {
+	param:   string
+	derived: configs[param]
+}
+
+a: shared & {
+	param: "key"
+}
diff --git a/tools/trim/trim.go b/tools/trim/trim.go
@@ -216,7 +216,7 @@ func (t *trimmer) addDominators(d, v *adt.Vertex, hasDisjunction bool) (doms *ad
 			if r, ok := c.Expr().(adt.Resolver); ok {
 				x, _ := t.ctx.Resolve(c.Env, r)
 				// Even if this is not a dominator now, descendants will be.
-				if x.Label.IsDef() {
+				if x != nil && x.Label.IsDef() {
 					for _, c := range x.Conjuncts {
 						doms.AddConjunct(c)
 					}