6c1dae73cd
gcc/c/ChangeLog: PR c++/61339 * c-decl.c: Change class-key from class to struct and vice versa to match convention and avoid -Wclass-is-pod and -Wstruct-no-pod. * gimple-parser.c: Same. gcc/c-family/ChangeLog: PR c++/61339 * c-format.c (check_argument_type): Change class-key from class to struct and vice versa to match convention and avoid -Wclass-is-pod and -Wstruct-no-pod. * c-pretty-print.h: Same. gcc/cp/ChangeLog: PR c++/61339 * constexpr.c (cxx_eval_call_expression): Change class-key from class to struct and vice versa to match convention and avoid -Wclass-is-pod and -Wstruct-no-pod. * constraint.cc (get_concept_definition): Same. * cp-tree.h: Same. * cxx-pretty-print.h: Same. * error.c: Same. * logic.cc (term_list::replace): Same. * name-lookup.c (find_local_binding): Same. * pt.c (tsubst_binary_right_fold): Same. * search.c (field_accessor_p): Same. * semantics.c (expand_or_defer_fn): Same. gcc/lto/ChangeLog: PR c++/61339 * lto-dump.c: Change class-key from classi to struct and vice versa to match convention and avoid -Wclass-is-pod and -Wstruct-no-pod. gcc/ChangeLog: PR c++/61339 * align.h: Change class-key from class to struct and vice versa to match convention and avoid -Wclass-is-pod and -Wstruct-no-pod. * alloc-pool.h: Same. * asan.c (shadow_mem_size): Same. * auto-profile.c: Same. * basic-block.h: Same. * bitmap.h: Same. * cfgexpand.c (set_rtl): Same. (expand_one_stack_var_at): Same. * cfghooks.h: Same. * cfgloop.h: Same. * cgraph.h: Same. * config/i386/i386.h: Same. * df-problems.c (df_print_bb_index): Same. * df-scan.c: Same. * df.h (df_single_use): Same. * diagnostic-show-locus.c (layout::print_annotation_line): Same. (layout::annotation_line_showed_range_p): Same. (get_printed_columns): Same. (correction::ensure_terminated): Same. (line_corrections::~line_corrections): Same. * dojump.h: Same. * dse.c: Same. * dump-context.h: Same. * dumpfile.h: Same. * dwarf2out.c: Same. * edit-context.c: Same. * fibonacci_heap.c (test_union_of_equal_heaps): Same. * flags.h: Same. * function.c (assign_stack_local): Same. * function.h: Same. * gcc.c: Same. * gcov.c (block_info::block_info): Same. * genattrtab.c: Same. * genextract.c: Same. * genmatch.c (comparison_code_p): Same. (id_base::id_base): Same. (decision_tree::print): Same. * genoutput.c: Same. * genpreds.c (write_one_predicate_function): Same. * genrecog.c (validate_pattern): Same. (find_operand_positions): Same. (optimize_subroutine_group): Same. (merge_pattern_transition::merge_pattern_transition): Same. (merge_pattern_info::merge_pattern_info): Same. (merge_state_result::merge_state_result): Same. (merge_into_state): Same. * gensupport.c: Same. * gensupport.h: Same. * ggc-common.c (init_ggc_heuristics): Same. * ggc-tests.c (test_union): Same. * gimple-loop-interchange.cc (dump_induction): Same. * gimple-loop-versioning.cc: Same. * gimple-match.h (gimple_match_cond::any_else): Same. * gimple-ssa-backprop.c: Same. * gimple-ssa-sprintf.c: Same. * gimple-ssa-store-merging.c (store_operand_info::store_operand_info): Same. (store_immediate_info::store_immediate_info): Same. (merged_store_group::apply_stores): Same. (get_location_for_stmts): Same. * gimple-ssa-strength-reduction.c: Same. * gimple-ssa-warn-alloca.c: Same. * gimple-ssa-warn-restrict.c (pass_wrestrict::execute): Same. * godump.c (go_type_decl): Same. * hash-map-tests.c (test_map_of_strings_to_int): Same. * hash-map.h: Same. * hash-set-tests.c (test_set_of_strings): Same. * hsa-brig.c: Same. * hsa-common.h: Same. * hsa-gen.c (transformable_switch_to_sbr_p): Same. * input.c (assert_loceq): Same. * input.h: Same. * ipa-cp.c: Same. * ipa-devirt.c (possible_polymorphic_call_targets_1): Same. * ipa-fnsummary.h: Same. * ipa-inline.h: Same. * ipa-prop.h: Same. * ipa-split.c (visit_bb): Same. * ira-int.h (minmax_set_iter_next): Same. * loop-invariant.c: Same. * loop-iv.c: Same. * lra-eliminations.c: Same. * lra-int.h: Same. * lra-lives.c (mark_regno_dead): Same. * lra-remat.c: Same. * lra-spills.c: Same. * lto-streamer.h: Same. * mem-stats.h: Same. * omp-grid.c (omp_grid_lastprivate_predicate): Same. * omp-low.c (omp_clause_aligned_alignment): Same. * optabs-query.h (get_vcond_eq_icode): Same. * optabs.h: Same. * opts.c (wrap_help): Same. * poly-int.h: Same. * predict.c (predict_paths_leading_to_edge): Same. * pretty-print.h: Same. * profile-count.h: Same. * read-md.h: Same. * read-rtl-function.c: Same. * ree.c: Same. * reginfo.c: Same. * regrename.c: Same. * regrename.h: Same. * reload.h: Same. * rtl-iter.h: Same. * rtl.h (costs_add_n_insns): Same. * sanopt.c: Same. * sched-int.h: Same. * sel-sched-ir.h: Same. * selftest.h: Same. * sese.h (vec_find): Same. * stmt.c: Same. * target-globals.h: Same. * tree-affine.c (aff_combination_find_elt): Same. * tree-affine.h: Same. * tree-data-ref.h: Same. * tree-outof-ssa.c (ssa_is_replaceable_p): Same. * tree-predcom.c: Same. * tree-scalar-evolution.c (find_var_scev_info): Same. * tree-ssa-alias.h: Same. * tree-ssa-ccp.c: Same. * tree-ssa-coalesce.c (ssa_conflicts_dump): Same. * tree-ssa-loop-im.c (for_all_locs_in_loop): Same. (rewrite_mem_refs): Same. (execute_sm_if_changed): Same. (hoist_memory_references): Same. * tree-ssa-loop-ivopts.c (operator<=): Same. * tree-ssa-loop.h: Same. * tree-ssa-pre.c (get_or_alloc_expr_for_name): Same. * tree-ssa-structalias.c: Same. * tree-switch-conversion.h (cluster::cluster): Same. (simple_cluster::simple_cluster): Same. * tree-vect-patterns.c (type_conversion_p): Same. * tree-vectorizer.c (dump_stmt_cost): Same. * tree-vectorizer.h (loop_vec_info_for_loop): Same. * tree.c (protected_set_expr_location): Same. * tree.h (desired_pro_or_demotion_p): Same. (fndecl_built_in_p): Same. * unique-ptr-tests.cc: Same. * var-tracking.c (delete_variable_part): Same. * varasm.c (assemble_real): Same. (tree_output_constant_def): Same. * vec.c: Same. * wide-int-bitmask.h: Same. * wide-int.h (decompose): Same. From-SVN: r273308
472 lines
11 KiB
C
472 lines
11 KiB
C
/* Dependency generator for Makefile fragments.
|
|
Copyright (C) 2000-2019 Free Software Foundation, Inc.
|
|
Contributed by Zack Weinberg, Mar 2000
|
|
|
|
This program is free software; you can redistribute it and/or modify it
|
|
under the terms of the GNU General Public License as published by the
|
|
Free Software Foundation; either version 3, or (at your option) any
|
|
later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; see the file COPYING3. If not see
|
|
<http://www.gnu.org/licenses/>.
|
|
|
|
In other words, you are welcome to use, share and improve this program.
|
|
You are forbidden to forbid anyone else to use, share and improve
|
|
what you give them. Help stamp out software-hoarding! */
|
|
|
|
#include "config.h"
|
|
#include "system.h"
|
|
#include "mkdeps.h"
|
|
|
|
/* Not set up to just include std::vector et al, here's a simple
|
|
implementation. */
|
|
|
|
/* Keep this structure local to this file, so clients don't find it
|
|
easy to start making assumptions. */
|
|
class mkdeps
|
|
{
|
|
public:
|
|
/* T has trivial cctor & dtor. */
|
|
template <typename T>
|
|
class vec
|
|
{
|
|
private:
|
|
T *ary;
|
|
unsigned num;
|
|
unsigned alloc;
|
|
|
|
public:
|
|
vec ()
|
|
: ary (NULL), num (0), alloc (0)
|
|
{}
|
|
~vec ()
|
|
{
|
|
XDELETEVEC (ary);
|
|
}
|
|
|
|
public:
|
|
unsigned size () const
|
|
{
|
|
return num;
|
|
}
|
|
const T &operator[] (unsigned ix) const
|
|
{
|
|
return ary[ix];
|
|
}
|
|
T &operator[] (unsigned ix)
|
|
{
|
|
return ary[ix];
|
|
}
|
|
void push (const T &elt)
|
|
{
|
|
if (num == alloc)
|
|
{
|
|
alloc = alloc ? alloc * 2 : 16;
|
|
ary = XRESIZEVEC (T, ary, alloc);
|
|
}
|
|
ary[num++] = elt;
|
|
}
|
|
};
|
|
struct velt
|
|
{
|
|
const char *str;
|
|
size_t len;
|
|
};
|
|
|
|
mkdeps ()
|
|
: quote_lwm (0)
|
|
{
|
|
}
|
|
~mkdeps ()
|
|
{
|
|
unsigned int i;
|
|
|
|
for (i = targets.size (); i--;)
|
|
free (const_cast <char *> (targets[i]));
|
|
for (i = deps.size (); i--;)
|
|
free (const_cast <char *> (deps[i]));
|
|
for (i = vpath.size (); i--;)
|
|
XDELETEVEC (vpath[i].str);
|
|
}
|
|
|
|
public:
|
|
vec<const char *> targets;
|
|
vec<const char *> deps;
|
|
vec<velt> vpath;
|
|
|
|
public:
|
|
unsigned short quote_lwm;
|
|
};
|
|
|
|
/* Apply Make quoting to STR, TRAIL etc. Note that it's not possible
|
|
to quote all such characters - e.g. \n, %, *, ?, [, \ (in some
|
|
contexts), and ~ are not properly handled. It isn't possible to
|
|
get this right in any current version of Make. (??? Still true?
|
|
Old comment referred to 3.76.1.) */
|
|
|
|
static const char *
|
|
munge (const char *str, const char *trail = NULL, ...)
|
|
{
|
|
static unsigned alloc;
|
|
static char *buf;
|
|
unsigned dst = 0;
|
|
va_list args;
|
|
if (trail)
|
|
va_start (args, trail);
|
|
|
|
for (bool first = true; str; first = false)
|
|
{
|
|
unsigned slashes = 0;
|
|
char c;
|
|
for (const char *probe = str; (c = *probe++);)
|
|
{
|
|
if (alloc < dst + 4 + slashes)
|
|
{
|
|
alloc = alloc * 2 + 32;
|
|
buf = XRESIZEVEC (char, buf, alloc);
|
|
}
|
|
|
|
switch (c)
|
|
{
|
|
case '\\':
|
|
slashes++;
|
|
break;
|
|
|
|
case '$':
|
|
buf[dst++] = '$';
|
|
goto def;
|
|
|
|
case ' ':
|
|
case '\t':
|
|
/* GNU make uses a weird quoting scheme for white space.
|
|
A space or tab preceded by 2N+1 backslashes
|
|
represents N backslashes followed by space; a space
|
|
or tab preceded by 2N backslashes represents N
|
|
backslashes at the end of a file name; and
|
|
backslashes in other contexts should not be
|
|
doubled. */
|
|
while (slashes--)
|
|
buf[dst++] = '\\';
|
|
/* FALLTHROUGH */
|
|
|
|
case '#':
|
|
case ':':
|
|
buf[dst++] = '\\';
|
|
/* FALLTHROUGH */
|
|
|
|
default:
|
|
def:
|
|
slashes = 0;
|
|
break;
|
|
}
|
|
|
|
buf[dst++] = c;
|
|
}
|
|
|
|
if (first)
|
|
str = trail;
|
|
else
|
|
str = va_arg (args, const char *);
|
|
}
|
|
if (trail)
|
|
va_end (args);
|
|
|
|
buf[dst] = 0;
|
|
return buf;
|
|
}
|
|
|
|
/* If T begins with any of the partial pathnames listed in d->vpathv,
|
|
then advance T to point beyond that pathname. */
|
|
static const char *
|
|
apply_vpath (struct mkdeps *d, const char *t)
|
|
{
|
|
if (unsigned len = d->vpath.size ())
|
|
for (unsigned i = len; i--;)
|
|
{
|
|
if (!filename_ncmp (d->vpath[i].str, t, d->vpath[i].len))
|
|
{
|
|
const char *p = t + d->vpath[i].len;
|
|
if (!IS_DIR_SEPARATOR (*p))
|
|
goto not_this_one;
|
|
|
|
/* Do not simplify $(vpath)/../whatever. ??? Might not
|
|
be necessary. */
|
|
if (p[1] == '.' && p[2] == '.' && IS_DIR_SEPARATOR (p[3]))
|
|
goto not_this_one;
|
|
|
|
/* found a match */
|
|
t = t + d->vpath[i].len + 1;
|
|
break;
|
|
}
|
|
not_this_one:;
|
|
}
|
|
|
|
/* Remove leading ./ in any case. */
|
|
while (t[0] == '.' && IS_DIR_SEPARATOR (t[1]))
|
|
{
|
|
t += 2;
|
|
/* If we removed a leading ./, then also remove any /s after the
|
|
first. */
|
|
while (IS_DIR_SEPARATOR (t[0]))
|
|
++t;
|
|
}
|
|
|
|
return t;
|
|
}
|
|
|
|
/* Public routines. */
|
|
|
|
struct mkdeps *
|
|
deps_init (void)
|
|
{
|
|
return new mkdeps ();
|
|
}
|
|
|
|
void
|
|
deps_free (struct mkdeps *d)
|
|
{
|
|
delete d;
|
|
}
|
|
|
|
/* Adds a target T. We make a copy, so it need not be a permanent
|
|
string. QUOTE is true if the string should be quoted. */
|
|
void
|
|
deps_add_target (struct mkdeps *d, const char *t, int quote)
|
|
{
|
|
t = xstrdup (apply_vpath (d, t));
|
|
|
|
if (!quote)
|
|
{
|
|
/* Sometimes unquoted items are added after quoted ones.
|
|
Swap out the lowest quoted. */
|
|
if (d->quote_lwm != d->targets.size ())
|
|
{
|
|
const char *lowest = d->targets[d->quote_lwm];
|
|
d->targets[d->quote_lwm] = t;
|
|
t = lowest;
|
|
}
|
|
d->quote_lwm++;
|
|
}
|
|
|
|
d->targets.push (t);
|
|
}
|
|
|
|
/* Sets the default target if none has been given already. An empty
|
|
string as the default target in interpreted as stdin. The string
|
|
is quoted for MAKE. */
|
|
void
|
|
deps_add_default_target (struct mkdeps *d, const char *tgt)
|
|
{
|
|
/* Only if we have no targets. */
|
|
if (d->targets.size ())
|
|
return;
|
|
|
|
if (tgt[0] == '\0')
|
|
deps_add_target (d, "-", 1);
|
|
else
|
|
{
|
|
#ifndef TARGET_OBJECT_SUFFIX
|
|
# define TARGET_OBJECT_SUFFIX ".o"
|
|
#endif
|
|
const char *start = lbasename (tgt);
|
|
char *o = (char *) alloca (strlen (start)
|
|
+ strlen (TARGET_OBJECT_SUFFIX) + 1);
|
|
char *suffix;
|
|
|
|
strcpy (o, start);
|
|
|
|
suffix = strrchr (o, '.');
|
|
if (!suffix)
|
|
suffix = o + strlen (o);
|
|
strcpy (suffix, TARGET_OBJECT_SUFFIX);
|
|
|
|
deps_add_target (d, o, 1);
|
|
}
|
|
}
|
|
|
|
void
|
|
deps_add_dep (struct mkdeps *d, const char *t)
|
|
{
|
|
gcc_assert (*t);
|
|
|
|
t = apply_vpath (d, t);
|
|
|
|
d->deps.push (xstrdup (t));
|
|
}
|
|
|
|
void
|
|
deps_add_vpath (struct mkdeps *d, const char *vpath)
|
|
{
|
|
const char *elem, *p;
|
|
|
|
for (elem = vpath; *elem; elem = p)
|
|
{
|
|
for (p = elem; *p && *p != ':'; p++)
|
|
continue;
|
|
mkdeps::velt elt;
|
|
elt.len = p - elem;
|
|
char *str = XNEWVEC (char, elt.len + 1);
|
|
elt.str = str;
|
|
memcpy (str, elem, elt.len);
|
|
str[elt.len] = '\0';
|
|
if (*p == ':')
|
|
p++;
|
|
|
|
d->vpath.push (elt);
|
|
}
|
|
}
|
|
|
|
/* Write NAME, with a leading space to FP, a Makefile. Advance COL as
|
|
appropriate, wrap at COLMAX, returning new column number. Iff
|
|
QUOTE apply quoting. Append TRAIL. */
|
|
|
|
static unsigned
|
|
make_write_name (const char *name, FILE *fp, unsigned col, unsigned colmax,
|
|
bool quote = true, const char *trail = NULL)
|
|
{
|
|
if (quote)
|
|
name = munge (name, trail, NULL);
|
|
unsigned size = strlen (name);
|
|
|
|
if (col)
|
|
{
|
|
if (colmax && col + size> colmax)
|
|
{
|
|
fputs (" \\\n", fp);
|
|
col = 0;
|
|
}
|
|
col++;
|
|
fputs (" ", fp);
|
|
}
|
|
|
|
col += size;
|
|
fputs (name, fp);
|
|
|
|
return col;
|
|
}
|
|
|
|
/* Write all the names in VEC via make_write_name. */
|
|
|
|
static unsigned
|
|
make_write_vec (const mkdeps::vec<const char *> &vec, FILE *fp,
|
|
unsigned col, unsigned colmax, unsigned quote_lwm = 0,
|
|
const char *trail = NULL)
|
|
{
|
|
for (unsigned ix = 0; ix != vec.size (); ix++)
|
|
col = make_write_name (vec[ix], fp, col, colmax, ix >= quote_lwm, trail);
|
|
return col;
|
|
}
|
|
|
|
/* Write the dependencies to a Makefile. If PHONY is true, add
|
|
.PHONY targets for all the dependencies too. */
|
|
|
|
static void
|
|
make_write (const struct mkdeps *d, FILE *fp, bool phony, unsigned int colmax)
|
|
{
|
|
unsigned column = 0;
|
|
if (colmax && colmax < 34)
|
|
colmax = 34;
|
|
|
|
if (d->deps.size ())
|
|
{
|
|
column = make_write_vec (d->targets, fp, 0, colmax, d->quote_lwm);
|
|
fputs (":", fp);
|
|
column++;
|
|
make_write_vec (d->deps, fp, column, colmax);
|
|
fputs ("\n", fp);
|
|
if (phony)
|
|
for (unsigned i = 1; i < d->deps.size (); i++)
|
|
fprintf (fp, "%s:\n", munge (d->deps[i]));
|
|
}
|
|
}
|
|
|
|
/* Write out dependencies according to the selected format (which is
|
|
only Make at the moment). */
|
|
|
|
void
|
|
deps_write (const struct mkdeps *d, FILE *fp, bool phony, unsigned int colmax)
|
|
{
|
|
make_write (d, fp, phony, colmax);
|
|
}
|
|
|
|
/* Write out a deps buffer to a file, in a form that can be read back
|
|
with deps_restore. Returns nonzero on error, in which case the
|
|
error number will be in errno. */
|
|
|
|
int
|
|
deps_save (struct mkdeps *deps, FILE *f)
|
|
{
|
|
unsigned int i;
|
|
size_t size;
|
|
|
|
/* The cppreader structure contains makefile dependences. Write out this
|
|
structure. */
|
|
|
|
/* The number of dependences. */
|
|
size = deps->deps.size ();
|
|
if (fwrite (&size, sizeof (size), 1, f) != 1)
|
|
return -1;
|
|
|
|
/* The length of each dependence followed by the string. */
|
|
for (i = 0; i < deps->deps.size (); i++)
|
|
{
|
|
size = strlen (deps->deps[i]);
|
|
if (fwrite (&size, sizeof (size), 1, f) != 1)
|
|
return -1;
|
|
if (fwrite (deps->deps[i], size, 1, f) != 1)
|
|
return -1;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* Read back dependency information written with deps_save into
|
|
the deps sizefer. The third argument may be NULL, in which case
|
|
the dependency information is just skipped, or it may be a filename,
|
|
in which case that filename is skipped. */
|
|
|
|
int
|
|
deps_restore (struct mkdeps *deps, FILE *fd, const char *self)
|
|
{
|
|
size_t size;
|
|
char *buf = NULL;
|
|
size_t buf_size = 0;
|
|
|
|
/* Number of dependences. */
|
|
if (fread (&size, sizeof (size), 1, fd) != 1)
|
|
return -1;
|
|
|
|
/* The length of each dependence string, followed by the string. */
|
|
for (unsigned i = size; i--;)
|
|
{
|
|
/* Read in # bytes in string. */
|
|
if (fread (&size, sizeof (size), 1, fd) != 1)
|
|
return -1;
|
|
|
|
if (size >= buf_size)
|
|
{
|
|
buf_size = size + 512;
|
|
buf = XRESIZEVEC (char, buf, buf_size);
|
|
}
|
|
if (fread (buf, 1, size, fd) != size)
|
|
{
|
|
XDELETEVEC (buf);
|
|
return -1;
|
|
}
|
|
buf[size] = 0;
|
|
|
|
/* Generate makefile dependencies from .pch if -nopch-deps. */
|
|
if (self != NULL && filename_cmp (buf, self) != 0)
|
|
deps_add_dep (deps, buf);
|
|
}
|
|
|
|
XDELETEVEC (buf);
|
|
return 0;
|
|
}
|