[master] f72c22352 Do not preemptively convert handles to STRING if we can do so later

[Poul-Henning Kamp]

commit f72c22352467512dca79a8f53f484f1f93f21213
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Jun 3 13:55:37 2019 +0000

    Do not preemptively convert handles to STRING if we can do so later

diff --git a/lib/libvcc/vcc_expr.c b/lib/libvcc/vcc_expr.c
index 1221c4e9e..13931d13c 100644
--- a/lib/libvcc/vcc_expr.c
+++ b/lib/libvcc/vcc_expr.c
@@ -315,7 +315,8 @@ vcc_Eval_Handle(struct vcc *tl, struct expr **e, struct token *t,
 	AN(sym->rname);
 	AZ(type->stringform);
 
-	if (sym->type != STRING && type == STRINGS) {
+	if (sym->type->tostring == NULL &&
+	    sym->type != STRING && type == STRINGS) {
 		*e = vcc_mk_expr(STRINGS, "\"%s\"", sym->name);
 		(*e)->nstr = 1;
 		(*e)->constant |= EXPR_CONST | EXPR_STR_CONST;