mirror of
git://sourceware.org/git/libabigail.git
synced 2024-12-22 09:49:59 +00:00
305f18e91e
* include/abg-fwd.h (member_function_is_virtual): Declare new function. * include/abg-comparison.h (diff_category::{NON_VIRT_MEM_FUN_CHANGE_CATEGORY, VIRTUAL_MEMBER_CHANGE_CATEGORY}): New enumerators. (diff_category::EVERYTHING_CATEGORY): Adjust. (class_diff::{changed, deleted, inserted}_member_fns): Declare new member functions. * src/abg-comp-filter.cc (data_member_added_or_removed): Add missing comments. (has_non_virtual_mem_fn_change): New static predicate function. (harmless_filter::visit): Categorize non-virtual member function changes in a diff into NON_VIRT_MEM_FUN_CHANGE_CATEGORY. * src/abg-comparison.cc (TRAVERSE_MEM_FN_DIFF_NODE_AND_PROPAGATE_CATEGORY): New macro. (report_mem_header): Count filtered functions for added/deleted functions as well. (class_diff::priv::count_filtered_changed_mem_fns): Renamed priv::count_filtered_member_functions into this. Filter out changes to non-virtual member functions here. (class_diff::priv::count_filtered_{inserted, deleted}_mem_fns): New member functions. (class_diff::{deleted, inserted, changed}_member_fns): Define new member functions. (class_diff::report): Adjust count for filtered inserted/deleted member functions. Do not report NON_VIRT_MEM_FUN_CHANGE_CATEGORY if it's disallowed. (class_diff::traverse): Propagate only VIRTUAL_MEMBER_CHANGE_CATEGORY from member functions to their enclosing class. * src/abg-ir.cc (member_function_is_virtual): Define new functions. * tools/bidiff.cc (set_diff_context_from_opts): Adjust to add NON_VIRT_MEM_FUN_CHANGE_CATEGORY into the harmless group and VIRTUAL_MEMBER_CHANGE_CATEGORY into the harmful one. * tests/data/test-diff-filter/test0-report.txt: New test input. * tests/data/test-diff-filter/test10-report.txt: Likewise. * tests/data/test-diff-filter/test10-v0.cc: Likewise. * tests/data/test-diff-filter/test10-v0.o: Likewise. * tests/data/test-diff-filter/test10-v1.cc: Likewise. * tests/data/test-diff-filter/test10-v1.o: Likewise. * tests/data/test-diff-filter/test11-report.txt: Likewise. * tests/data/test-diff-filter/test11-v0.cc: Likewise. * tests/data/test-diff-filter/test11-v0.o: Likewise. * tests/data/test-diff-filter/test11-v1.cc: Likewise. * tests/data/test-diff-filter/test11-v1.o: Likewise. * tests/data/test-diff-filter/test2-report.txt: Likewise. * tests/data/test-diff-filter/test9-report.txt: Likewise. * tests/data/test-diff-filter/test9-v0.cc: Likewise. * tests/data/test-diff-filter/test9-v0.o: Likewise. * tests/data/test-diff-filter/test9-v1.cc: Likewise. * tests/data/test-diff-filter/test9-v1.o: Likewise. * tests/test-diff-filter.cc: Consume the test input above to run more tests. Signed-off-by: Dodji Seketeli <dodji@redhat.com>
470 lines
13 KiB
C++
470 lines
13 KiB
C++
// -*- Mode: C++ -*-
|
|
//
|
|
// Copyright (C) 2013 Red Hat, Inc.
|
|
//
|
|
// This file is part of the GNU Application Binary Interface Generic
|
|
// Analysis and Instrumentation Library (libabigail). This library is
|
|
// free software; you can redistribute it and/or modify it under the
|
|
// terms of the GNU Lesser General Public License as published by the
|
|
// Free Software Foundation; either version 3, or (at your option) any
|
|
// later version.
|
|
|
|
// This library 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 Lesser Public License for more details.
|
|
|
|
// You should have received a copy of the GNU Lesser General Public
|
|
// License along with this program; see the file COPYING-LGPLV3. If
|
|
// not, see <http://www.gnu.org/licenses/>.
|
|
//
|
|
// Author: Dodji Seketeli
|
|
|
|
/// @file
|
|
|
|
#include <cstring>
|
|
#include <vector>
|
|
#include <string>
|
|
#include <iostream>
|
|
#include "abg-comp-filter.h"
|
|
#include "abg-tools-utils.h"
|
|
#include "abg-reader.h"
|
|
#include "abg-dwarf-reader.h"
|
|
|
|
using std::vector;
|
|
using std::string;
|
|
using std::ostream;
|
|
using std::cout;
|
|
using std::cerr;
|
|
using abigail::translation_unit;
|
|
using abigail::translation_unit_sptr;
|
|
using abigail::corpus_sptr;
|
|
using abigail::comparison::translation_unit_diff_sptr;
|
|
using abigail::comparison::corpus_diff_sptr;
|
|
using abigail::comparison::compute_diff;
|
|
using abigail::tools::check_file;
|
|
using abigail::tools::guess_file_type;
|
|
|
|
struct options
|
|
{
|
|
string file1;
|
|
string file2;
|
|
vector<string> drop_fn_regex_patterns;
|
|
vector<string> drop_var_regex_patterns;
|
|
vector<string> keep_fn_regex_patterns;
|
|
vector<string> keep_var_regex_patterns;
|
|
bool show_stats_only;
|
|
bool show_symtabs;
|
|
bool show_deleted_fns;
|
|
bool show_changed_fns;
|
|
bool show_added_fns;
|
|
bool show_all_fns;
|
|
bool show_deleted_vars;
|
|
bool show_changed_vars;
|
|
bool show_added_vars;
|
|
bool show_all_vars;
|
|
bool show_harmful_changes;
|
|
bool show_harmless_changes;
|
|
|
|
options()
|
|
: show_stats_only(false),
|
|
show_symtabs(false),
|
|
show_deleted_fns(false),
|
|
show_changed_fns(false),
|
|
show_added_fns(false),
|
|
show_all_fns(true),
|
|
show_deleted_vars(false),
|
|
show_changed_vars(false),
|
|
show_added_vars(false),
|
|
show_all_vars(true),
|
|
show_harmful_changes(true),
|
|
show_harmless_changes(true)
|
|
{}
|
|
};//end struct options;
|
|
|
|
void
|
|
display_usage(const string prog_name, ostream& out)
|
|
{
|
|
out << "usage: " << prog_name << "[options] [<bi-file1> <bi-file2>]\n"
|
|
<< " where options can be:\n"
|
|
<< " --stat only display the diff stats\n"
|
|
<< " --symtabs only display the symbol tables of the corpora\n"
|
|
<< " --deleted-fns display deleted public functions\n"
|
|
<< " --changed-fns display changed public functions\n"
|
|
<< " --added-fns display added public functions\n"
|
|
<< " --deleted-vars display deleted global public variables\n"
|
|
<< " --changed-vars display changed global public variables\n"
|
|
<< " --added-vars display added global public variables\n"
|
|
<< " --drop <regex> drop functions and variables matching a regexp\n"
|
|
<< " --drop-fn <regex> drop functions matching a regexp\n"
|
|
<< " --drop-fn <regex> drop functions matching a regexp\n"
|
|
<< " --drop-var <regex> drop variables matching a regexp\n"
|
|
<< " --keep <regex> keep only functions and variables matching a regex\n"
|
|
<< " --keep-fn <regex> keep only functions matching a regex\n"
|
|
<< " --keep-var <regex> keep only variables matching a regex\n"
|
|
<< " --no-harmless do not display the harmless changes\n"
|
|
<< " --no-harmful do not display the harmful changes\n"
|
|
<< " --help display this message\n";
|
|
}
|
|
|
|
/// Parse the command line and set the options accordingly.
|
|
///
|
|
/// @param argc the number of words on the command line
|
|
///
|
|
/// @param argv the command line, which is an array of words.
|
|
///
|
|
/// @param opts the options data structure. This is set by the
|
|
/// function iff it returns true.
|
|
///
|
|
/// @return true if the command line could be parsed and opts filed,
|
|
/// false otherwise.
|
|
bool
|
|
parse_command_line(int argc, char* argv[], options& opts)
|
|
{
|
|
if (argc < 2)
|
|
return false;
|
|
|
|
for (int i = 1; i < argc; ++i)
|
|
{
|
|
if (argv[i][0] != '-')
|
|
{
|
|
if (opts.file1.empty())
|
|
opts.file1 = argv[i];
|
|
else if (opts.file2.empty())
|
|
opts.file2 = argv[i];
|
|
else
|
|
return false;
|
|
}
|
|
else if (!strcmp(argv[i], "--stat"))
|
|
opts.show_stats_only = true;
|
|
else if (!strcmp(argv[i], "--symtabs"))
|
|
opts.show_symtabs = true;
|
|
else if (!strcmp(argv[i], "--help"))
|
|
return false;
|
|
else if (!strcmp(argv[i], "--deleted-fns"))
|
|
{
|
|
opts.show_deleted_fns = true;
|
|
opts.show_all_fns = false;
|
|
opts.show_all_vars = false;
|
|
}
|
|
else if (!strcmp(argv[i], "--changed-fns"))
|
|
{
|
|
opts.show_changed_fns = true;
|
|
opts.show_all_fns = false;
|
|
opts.show_all_vars = false;
|
|
}
|
|
else if (!strcmp(argv[i], "--added-fns"))
|
|
{
|
|
opts.show_added_fns = true;
|
|
opts.show_all_fns = false;
|
|
opts.show_all_vars = false;
|
|
}
|
|
else if (!strcmp(argv[i], "--deleted-vars"))
|
|
{
|
|
opts.show_deleted_vars = true;
|
|
opts.show_all_fns = false;
|
|
opts.show_all_vars = false;
|
|
}
|
|
else if (!strcmp(argv[i], "--changed-vars"))
|
|
{
|
|
opts.show_changed_vars = true;
|
|
opts.show_all_fns = false;
|
|
opts.show_all_vars = false;
|
|
}
|
|
else if (!strcmp(argv[i], "--added-vars"))
|
|
{
|
|
opts.show_added_vars = true;
|
|
opts.show_all_fns = false;
|
|
opts.show_all_vars = false;
|
|
}
|
|
else if (!strcmp(argv[i], "--drop"))
|
|
{
|
|
int j = i + 1;
|
|
if (j >= argc)
|
|
return false;
|
|
opts.drop_fn_regex_patterns.push_back(argv[j]);
|
|
opts.drop_var_regex_patterns.push_back(argv[j]);
|
|
++i;
|
|
}
|
|
else if (!strcmp(argv[i], "--drop-fn"))
|
|
{
|
|
int j = i + 1;
|
|
if (j >= argc)
|
|
return false;
|
|
opts.drop_fn_regex_patterns.push_back(argv[j]);
|
|
++i;
|
|
}
|
|
else if (!strcmp(argv[i], "--drop-var"))
|
|
{
|
|
int j = i + 1;
|
|
if (j >= argc)
|
|
return false;
|
|
opts.drop_var_regex_patterns.push_back(argv[j]);
|
|
++i;
|
|
}
|
|
else if (!strcmp(argv[i], "--keep"))
|
|
{
|
|
int j = i + 1;
|
|
if (j >= argc)
|
|
return false;
|
|
opts.keep_fn_regex_patterns.push_back(argv[j]);
|
|
opts.keep_var_regex_patterns.push_back(argv[j]);
|
|
++i;
|
|
}
|
|
else if (!strcmp(argv[i], "--keep-fn"))
|
|
{
|
|
int j = i + 1;
|
|
if (j >= argc)
|
|
return false;
|
|
opts.keep_fn_regex_patterns.push_back(argv[j]);
|
|
}
|
|
else if (!strcmp(argv[i], "--keep-var"))
|
|
{
|
|
int j = i + 1;
|
|
if (j >= argc)
|
|
return false;
|
|
opts.keep_var_regex_patterns.push_back(argv[j]);
|
|
}
|
|
else if (!strcmp(argv[i], "--no-harmless"))
|
|
opts.show_harmless_changes = false;
|
|
else if (!strcmp(argv[i], "--no-harmful"))
|
|
opts.show_harmful_changes = false;
|
|
else
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
/// Display the function symbol tables for the two corpora.
|
|
///
|
|
/// @param c1 the first corpus to display the symbol table for.
|
|
///
|
|
/// @param c2 the second corpus to display the symbol table for.
|
|
///
|
|
/// @param o the output stream to emit the symbol tables to.
|
|
static void
|
|
display_symtabs(const corpus_sptr c1, const corpus_sptr c2, ostream& o)
|
|
{
|
|
o << "size of the functions symtabs: "
|
|
<< c1->get_functions().size()
|
|
<< " and "
|
|
<< c2->get_functions().size()
|
|
<< "\n\n";
|
|
|
|
if (c1->get_functions().size())
|
|
o << "First functions symbol table\n\n";
|
|
for (abigail::corpus::functions::const_iterator i =
|
|
c1->get_functions().begin();
|
|
i != c1->get_functions().end();
|
|
++i)
|
|
o << (*i)->get_pretty_representation() << std::endl;
|
|
|
|
if (c1->get_functions().size() != 0)
|
|
o << "\n";
|
|
|
|
if (c2->get_functions().size())
|
|
o << "Second functions symbol table\n\n";
|
|
for (abigail::corpus::functions::const_iterator i =
|
|
c2->get_functions().begin();
|
|
i != c2->get_functions().end();
|
|
++i)
|
|
o << (*i)->get_pretty_representation() << std::endl;
|
|
}
|
|
|
|
using abigail::comparison::diff_context_sptr;
|
|
using abigail::comparison::diff_context;
|
|
|
|
/// Update the diff context from the @ref options data structure.
|
|
///
|
|
/// @param ctxt the diff context to update.
|
|
///
|
|
/// @param opts the instance of @ref options to consider.
|
|
static void
|
|
set_diff_context_from_opts(diff_context_sptr ctxt,
|
|
options& opts)
|
|
{
|
|
ctxt->show_stats_only(opts.show_stats_only);
|
|
ctxt->show_deleted_fns(opts.show_all_fns || opts.show_deleted_fns);
|
|
ctxt->show_changed_fns(opts.show_all_fns || opts.show_changed_fns);
|
|
ctxt->show_added_fns(opts.show_all_fns || opts.show_added_fns);
|
|
ctxt->show_deleted_vars(opts.show_all_vars || opts.show_deleted_vars);
|
|
ctxt->show_changed_vars(opts.show_all_vars || opts.show_changed_vars);
|
|
ctxt->show_added_vars(opts.show_all_vars || opts.show_added_vars);
|
|
|
|
if (!opts.show_harmless_changes)
|
|
ctxt->switch_categories_off
|
|
(abigail::comparison::ACCESS_CHANGE_CATEGORY
|
|
| abigail::comparison::COMPATIBLE_TYPE_CHANGE_CATEGORY
|
|
| abigail::comparison::DECL_NAME_CHANGE_CATEGORY
|
|
| abigail::comparison::NON_VIRT_MEM_FUN_CHANGE_CATEGORY);
|
|
if (!opts.show_harmful_changes)
|
|
ctxt->switch_categories_off
|
|
(abigail::comparison::SIZE_OR_OFFSET_CHANGE_CATEGORY
|
|
| abigail::comparison::VIRTUAL_MEMBER_CHANGE_CATEGORY);
|
|
}
|
|
|
|
/// Set the regex patterns describing the functions to drop from the
|
|
/// symbol table of a given corpus.
|
|
///
|
|
/// @param opts the options to the regex patterns from.
|
|
///
|
|
/// @param c the corpus to set the regex patterns into.
|
|
static void
|
|
set_corpus_keep_drop_regex_patterns(options& opts, corpus_sptr c)
|
|
{
|
|
if (!opts.drop_fn_regex_patterns.empty())
|
|
{
|
|
vector<string>& v = opts.drop_fn_regex_patterns;
|
|
vector<string>& p = c->get_regex_patterns_of_fns_to_suppress();
|
|
p.assign(v.begin(), v.end());
|
|
}
|
|
|
|
if (!opts.keep_fn_regex_patterns.empty())
|
|
{
|
|
vector<string>& v = opts.keep_fn_regex_patterns;
|
|
vector<string>& p = c->get_regex_patterns_of_fns_to_keep();
|
|
p.assign(v.begin(), v.end());
|
|
}
|
|
|
|
if (!opts.drop_var_regex_patterns.empty())
|
|
{
|
|
vector<string>& v = opts.drop_var_regex_patterns;
|
|
vector<string>& p = c->get_regex_patterns_of_vars_to_suppress();
|
|
p.assign(v.begin(), v.end());
|
|
}
|
|
|
|
if (!opts.keep_var_regex_patterns.empty())
|
|
{
|
|
vector<string>& v = opts.keep_var_regex_patterns;
|
|
vector<string>& p = c->get_regex_patterns_of_vars_to_keep();
|
|
p.assign(v.begin(), v.end());
|
|
}
|
|
}
|
|
|
|
int
|
|
main(int argc, char* argv[])
|
|
{
|
|
options opts;
|
|
if (!parse_command_line(argc, argv, opts))
|
|
{
|
|
display_usage(argv[0], cerr);
|
|
return true;
|
|
}
|
|
|
|
if (!opts.file1.empty() && !opts.file2.empty())
|
|
{
|
|
if (!check_file(opts.file1, cerr))
|
|
return true;
|
|
|
|
if (!check_file(opts.file2, cerr))
|
|
return true;
|
|
|
|
abigail::tools::file_type t1_type, t2_type;
|
|
|
|
t1_type = guess_file_type(opts.file1);
|
|
if (t1_type == abigail::tools::FILE_TYPE_UNKNOWN)
|
|
{
|
|
cerr << "Unknown content type for file " << opts.file1 << "\n";
|
|
return true;
|
|
}
|
|
|
|
t2_type = guess_file_type(opts.file2);
|
|
if (t2_type == abigail::tools::FILE_TYPE_UNKNOWN)
|
|
{
|
|
cerr << "Unknown content type for file " << opts.file2 << "\n";
|
|
return true;
|
|
}
|
|
|
|
translation_unit_sptr t1, t2;
|
|
corpus_sptr c1, c2;
|
|
|
|
switch (t1_type)
|
|
{
|
|
case abigail::tools::FILE_TYPE_UNKNOWN:
|
|
cerr << "Unknown content type for file " << opts.file1 << "\n";
|
|
return true;
|
|
break;
|
|
case abigail::tools::FILE_TYPE_NATIVE_BI:
|
|
t1 = abigail::xml_reader::read_translation_unit_from_file(opts.file1);
|
|
break;
|
|
case abigail::tools::FILE_TYPE_ELF:
|
|
c1 = abigail::dwarf_reader::read_corpus_from_elf(opts.file1);
|
|
break;
|
|
case abigail::tools::FILE_TYPE_XML_CORPUS:
|
|
c1 =
|
|
abigail::xml_reader::read_corpus_from_native_xml_file(opts.file1);
|
|
break;
|
|
case abigail::tools::FILE_TYPE_ZIP_CORPUS:
|
|
c1 = abigail::xml_reader::read_corpus_from_file(opts.file1);
|
|
break;
|
|
}
|
|
|
|
switch (t2_type)
|
|
{
|
|
case abigail::tools::FILE_TYPE_UNKNOWN:
|
|
cerr << "Unknown content type for file " << opts.file2 << "\n";
|
|
return true;
|
|
break;
|
|
case abigail::tools::FILE_TYPE_NATIVE_BI:
|
|
t2 = abigail::xml_reader::read_translation_unit_from_file(opts.file2);
|
|
break;
|
|
case abigail::tools::FILE_TYPE_ELF:
|
|
c2 = abigail::dwarf_reader::read_corpus_from_elf(opts.file2);
|
|
break;
|
|
case abigail::tools::FILE_TYPE_XML_CORPUS:
|
|
c2 =
|
|
abigail::xml_reader::read_corpus_from_native_xml_file(opts.file2);
|
|
break;
|
|
case abigail::tools::FILE_TYPE_ZIP_CORPUS:
|
|
c2 = abigail::xml_reader::read_corpus_from_file(opts.file2);
|
|
break;
|
|
}
|
|
|
|
if (!t1 && !c1)
|
|
{
|
|
cerr << "failed to read input file " << opts.file1 << "\n";
|
|
return true;
|
|
}
|
|
|
|
if (!t2 && !c2)
|
|
{
|
|
cerr << "failed to read input file" << opts.file2 << "\n";
|
|
return true;
|
|
}
|
|
|
|
if (!!c1 != !!c2
|
|
|| !!t1 != !!t2)
|
|
{
|
|
cerr << "the two input should be of the same kind\n";
|
|
return true;
|
|
}
|
|
|
|
if (t1)
|
|
{
|
|
translation_unit_diff_sptr changes = compute_diff(t1, t2);
|
|
changes->report(cout);
|
|
}
|
|
else if (c1)
|
|
{
|
|
if (opts.show_symtabs)
|
|
{
|
|
display_symtabs(c1, c2, cout);
|
|
return false;
|
|
}
|
|
|
|
set_corpus_keep_drop_regex_patterns(opts, c1);
|
|
set_corpus_keep_drop_regex_patterns(opts, c2);
|
|
|
|
diff_context_sptr ctxt(new diff_context);
|
|
set_diff_context_from_opts(ctxt, opts);
|
|
corpus_diff_sptr changes = compute_diff(c1, c2, ctxt);
|
|
changes->report(cout);
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|