github-repos/make
1
0
Fork 0
mirror of https://github.com/mirror/make.git synced 2025-02-09 19:31:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge three parallel arrays into one. Make sure sufficient space is allocated.

Browse Source
This commit is contained in:
Boris Kolpackov 2009-09-25 15:44:27 +00:00
parent d65b267e4a
commit 5973926ce6
2 changed files with 43 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2009-09-25 Boris Kolpackov <boris@codesynthesis.com>
* implicit.c (pattern_search): Merge three parallel arrays,
TRYRULES, MATCHES, and CHECKED_LASTSLASH, into one array
of struct TRYRULE. In the old version the latter two arrays
had insufficient length.
2009-09-24 Paul Smith <psmith@gnu.org> 2009-09-24 Paul Smith <psmith@gnu.org>
* implicit.c (pattern_search): Add back support for order-only * implicit.c (pattern_search): Add back support for order-only

64
implicit.c
View File

@ -157,6 +157,20 @@ struct patdeps
unsigned int ignore_mtime : 1; unsigned int ignore_mtime : 1;
}; };
/* This structure stores information about pattern rules that we need
to try.
*/
struct tryrule
{
struct rule *rule;
/* Index of the target in this rule that matched the file. */
unsigned int matches;
/* Nonzero if the LASTSLASH logic was used in matching this rule. */
char checked_lastslash;
};
/* Search the pattern rules for a rule with an existing dependency to make /* Search the pattern rules for a rule with an existing dependency to make
FILE. If a rule is found, the appropriate commands and deps are put in FILE FILE. If a rule is found, the appropriate commands and deps are put in FILE
and 1 is returned. If not, 0 is returned. and 1 is returned. If not, 0 is returned.
@ -206,20 +220,12 @@ pattern_search (struct file *file, int archive,
unsigned int fullstemlen = 0; unsigned int fullstemlen = 0;
/* Buffer in which we store all the rules that are possibly applicable. */ /* Buffer in which we store all the rules that are possibly applicable. */
struct rule **tryrules = xmalloc (num_pattern_rules * max_pattern_targets struct tryrule *tryrules = xmalloc (num_pattern_rules * max_pattern_targets
* sizeof (struct rule *)); * sizeof (struct tryrule));
/* Number of valid elements in TRYRULES. */ /* Number of valid elements in TRYRULES. */
unsigned int nrules; unsigned int nrules;
/* The numbers of the rule targets of each rule
in TRYRULES that matched the target file. */
unsigned int *matches = alloca (num_pattern_rules * sizeof (unsigned int));
/* Each element is nonzero if LASTSLASH was used in
matching the corresponding element of TRYRULES. */
char *checked_lastslash = alloca (num_pattern_rules * sizeof (char));
/* The index in TRYRULES of the rule we found. */ /* The index in TRYRULES of the rule we found. */
unsigned int foundrule; unsigned int foundrule;
@ -377,9 +383,9 @@ pattern_search (struct file *file, int archive,
/* Record this rule in TRYRULES and the index of the matching /* Record this rule in TRYRULES and the index of the matching
target in MATCHES. If several targets of the same rule match, target in MATCHES. If several targets of the same rule match,
that rule will be in TRYRULES more than once. */ that rule will be in TRYRULES more than once. */
tryrules[nrules] = rule; tryrules[nrules].rule = rule;
matches[nrules] = ti; tryrules[nrules].matches = ti;
checked_lastslash[nrules] = check_lastslash; tryrules[nrules].checked_lastslash = check_lastslash;
++nrules; ++nrules;
} }
} }
@ -388,13 +394,13 @@ pattern_search (struct file *file, int archive,
retroactively reject any non-"terminal" rules that do always match. */ retroactively reject any non-"terminal" rules that do always match. */
if (specific_rule_matched) if (specific_rule_matched)
for (ri = 0; ri < nrules; ++ri) for (ri = 0; ri < nrules; ++ri)
if (!tryrules[ri]->terminal) if (!tryrules[ri].rule->terminal)
{ {
unsigned int j; unsigned int j;
for (j = 0; j < tryrules[ri]->num; ++j) for (j = 0; j < tryrules[ri].rule->num; ++j)
if (tryrules[ri]->targets[j][1] == '\0') if (tryrules[ri].rule->targets[j][1] == '\0')
{ {
tryrules[ri] = 0; tryrules[ri].rule = 0;
break; break;
} }
} }
@ -421,8 +427,9 @@ pattern_search (struct file *file, int archive,
const char *nptr = 0; const char *nptr = 0;
const char *dir = NULL; const char *dir = NULL;
int order_only = 0; int order_only = 0;
unsigned int matches;
rule = tryrules[ri]; rule = tryrules[ri].rule;
/* RULE is nil when we discover that a rule, already placed in /* RULE is nil when we discover that a rule, already placed in
TRYRULES, should not be applied. */ TRYRULES, should not be applied. */
@ -436,10 +443,11 @@ pattern_search (struct file *file, int archive,
/* From the lengths of the filename and the matching pattern parts, /* From the lengths of the filename and the matching pattern parts,
find the stem: the part of the filename that matches the %. */ find the stem: the part of the filename that matches the %. */
stem = filename + (rule->suffixes[matches[ri]] matches = tryrules[ri].matches;
- rule->targets[matches[ri]]) - 1; stem = filename + (rule->suffixes[matches]
stemlen = (namelen - rule->lens[matches[ri]]) + 1; - rule->targets[matches]) - 1;
check_lastslash = checked_lastslash[ri]; stemlen = (namelen - rule->lens[matches]) + 1;
check_lastslash = tryrules[ri].checked_lastslash;
if (check_lastslash) if (check_lastslash)
{ {
stem += pathlen; stem += pathlen;
@ -634,7 +642,7 @@ pattern_search (struct file *file, int archive,
? _("Rejecting impossible rule prerequisite `%s'.\n") ? _("Rejecting impossible rule prerequisite `%s'.\n")
: _("Rejecting impossible implicit prerequisite `%s'.\n"), : _("Rejecting impossible implicit prerequisite `%s'.\n"),
d->name)); d->name));
tryrules[ri] = 0; tryrules[ri].rule = 0;
failed = 1; failed = 1;
break; break;
@ -780,7 +788,7 @@ pattern_search (struct file *file, int archive,
if (recursions > 0) if (recursions > 0)
/* Kludge-o-matic */ /* Kludge-o-matic */
file->name = rule->targets[matches[foundrule]]; file->name = rule->targets[tryrules[foundrule].matches];
/* DEPLIST lists the prerequisites for the rule we found. This includes the /* DEPLIST lists the prerequisites for the rule we found. This includes the
intermediate files, if any. Convert them into entries on the deps-chain intermediate files, if any. Convert them into entries on the deps-chain
@ -845,7 +853,7 @@ pattern_search (struct file *file, int archive,
dep->file = enter_file (s); dep->file = enter_file (s);
} }
if (pat->file == 0 && tryrules[foundrule]->terminal) if (pat->file == 0 && tryrules[foundrule].rule->terminal)
{ {
/* If the file actually existed (was not an intermediate file), and /* If the file actually existed (was not an intermediate file), and
the rule that found it was a terminal one, then we want to mark the rule that found it was a terminal one, then we want to mark
@ -862,7 +870,7 @@ pattern_search (struct file *file, int archive,
file->deps = dep; file->deps = dep;
} }
if (!checked_lastslash[foundrule]) if (!tryrules[foundrule].checked_lastslash)
{ {
/* Always allocate new storage, since STEM might be on the stack for an /* Always allocate new storage, since STEM might be on the stack for an
intermediate file. */ intermediate file. */
@ -889,7 +897,7 @@ pattern_search (struct file *file, int archive,
/* Set precious flag. */ /* Set precious flag. */
{ {
struct file *f = lookup_file (rule->targets[matches[foundrule]]); struct file *f = lookup_file (rule->targets[tryrules[foundrule].matches]);
if (f && f->precious) if (f && f->precious)
file->precious = 1; file->precious = 1;
} }
@ -899,7 +907,7 @@ pattern_search (struct file *file, int archive,
if (rule->num > 1) if (rule->num > 1)
for (ri = 0; ri < rule->num; ++ri) for (ri = 0; ri < rule->num; ++ri)
if (ri != matches[foundrule]) if (ri != tryrules[foundrule].matches)
{ {
char *nm = alloca (rule->lens[ri] + fullstemlen + 1); char *nm = alloca (rule->lens[ri] + fullstemlen + 1);
char *p = nm; char *p = nm;