Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make: skip variable lookup for '::=' modifiers in parse-only mode

Browse Source 
This is just to keep the code consistent among the various variable
modifiers.  The performance gain is negligible.

The actual assignment to the variable had already been skipped
previously.

No functional change.
This commit is contained in:
rillig 2021-03-14 20:18:33 +00:00
parent 96491d26ea
commit 259019554f
1 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
usr.bin/make/var.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: var.c,v 1.881 2021/03/14 20:12:16 rillig Exp $ */
/* $NetBSD: var.c,v 1.882 2021/03/14 20:18:33 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@ -140,7 +140,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
MAKE_RCSID("$NetBSD: var.c,v 1.881 2021/03/14 20:12:16 rillig Exp $");
MAKE_RCSID("$NetBSD: var.c,v 1.882 2021/03/14 20:18:33 rillig Exp $");
typedef enum VarFlags {
VFL_NONE = 0,
@ -3404,6 +3404,9 @@ ok:
(*pp)--; /* Go back to the st->endc. */
if (!(expr->eflags & VARE_WANTRES))
goto done;
scope = expr->scope; /* scope where v belongs */
if (expr->defined == DEF_REGULAR && expr->scope != SCOPE_GLOBAL) {
Var *gv = VarFind(expr->var->name.str, expr->scope, FALSE);
@ -3414,33 +3417,32 @@ ok:
}
/* XXX: Expanding the variable name at this point sounds wrong. */
if (expr->eflags & VARE_WANTRES) {
switch (op[0]) {
case '+':
Var_AppendExpand(scope, expr->var->name.str, val);
break;
case '!': {
const char *errfmt;
char *cmd_output = Cmd_Exec(val, &errfmt);
if (errfmt != NULL)
Error(errfmt, val);
else
Var_SetExpand(scope,
expr->var->name.str, cmd_output);
free(cmd_output);
break;
}
case '?':
if (expr->defined == DEF_REGULAR)
break;
/* FALLTHROUGH */
default:
Var_SetExpand(scope, expr->var->name.str, val);
break;
}
switch (op[0]) {
case '+':
Var_AppendExpand(scope, expr->var->name.str, val);
break;
case '!': {
const char *errfmt;
char *cmd_output = Cmd_Exec(val, &errfmt);
if (errfmt != NULL)
Error(errfmt, val);
else
Var_SetExpand(scope, expr->var->name.str, cmd_output);
free(cmd_output);
break;
}
case '?':
if (expr->defined == DEF_REGULAR)
break;
/* FALLTHROUGH */
default:
Var_SetExpand(scope, expr->var->name.str, val);
break;
}
free(val);
Expr_SetValueRefer(expr, "");
done:
free(val);
return AMR_OK;
}