mirror of
git://sourceware.org/git/libabigail.git
synced 2024-12-19 00:14:33 +00:00
98c8d61684
This patch allows dropping suppressed ABI artifacts from the in-memory internal representation right during the DWARF or abixml reading. In practise, this means that abidw and abilint now have a --suppressions options to give them suppression specifications. If a suppression specification that has the "drop" property matches an ABI artifact (type, function or variable) then that artifact is dropped from the internal representation. This also applies to abidiff. Note that now, by default, ABI artifacts (types) that are suppressed due to the --headers-dir{1,2} option of abidiff are now also dropped from the IR as well. Incidentally, abidw and abilint tools now have a --header-dir option too. * doc/manuals/abidw.rst: Document the new --suppressions and --headers-dir options off the abidw tool. * doc/manuals/abilint.rst: Document the new --suppressions and --headers-dir options on the abilint tool. * doc/manuals/libabigail-concepts.rst: Document the new "drop" and "name_not_regexp" properties on suppression directives. * include/abg-corpus.h (corpus::corpus): Add a default argument to the path parameter. * src/abg-suppression-priv.h: New private header file. * src/Makefile.am: Add the new abg-suppression-priv.h file to source distribution. * include/abg-suppression.h ({suppression_base, type_suppression, function_suppression, variable_suppression}::priv): Make these public. (suppression_base::{g,s}et_drops_artifact_from_ir): Declare new member functions. (type_suppression::{suppressed_type}): Likewise. (suppression_base::{names,sonames}_of_binaries_match): Remove member functions. (function_suppression::{get_name, set_name, get_name_regex_str, set_name_regex_str}): Renamed get_function_name, set_function_name, get_function_name_regex_str, set_function_name_regex_str into these. ({variable,function}_suppression::{g,s}et_name_not_regex_str): Declare new member functions. * src/abg-suppression.cc: Include the new abg-suppression-priv.h private header. (class suppression_base::priv, class type_suppression::priv, class function_suppression::parameter_spec::priv, class function_suppression::priv, class variable_suppression::priv): Move these types to that new private header. (suppression_base::{g,s}et_drops_artifact_from_ir) (function_suppression::{g,s}et_name_not_regex_str) (variable_suppression::{g,s}et_name_not_regex_str): New member functions. (sonames_of_binaries_match): New static function, taken from suppression_base::sonames_of_binaries_match. (names_of_binaries_match): New static function, taken from suppression_base::names_of_binaries_match. (suppression_matches_type_no_name): New static function. (type_suppression::suppresses_type): Adjust (function_suppression::suppresses_function) (variable_suppression::suppresses_variable): Adjust. Evaluate the new "name_not_regexp" property. (suppression_matches_type_name) (suppression_matches_type_location) (suppression_matches_type_name_or_location) (suppression_matches_function_name) (suppression_matches_function_sym_name) (suppression_matches_variable_name) (suppression_matches_variable_sym_name, suppression_matches_type): New functions. (read_type_suppression): Support the new "drop_artifacts" and "drop" properties. (read_function_suppression, read_variable_suppression): Support the new "drop_artifacts", "drop", and "name_not_regexp" properties. (function_suppression::{g,s}et_name): Renamed {g,s}et_function_name into these. (function_suppression::set_name_not_regex_str): Renamed {g,s}et_name_regex_str into this. (function_suppression::suppresses_function_symbol): Adjust. * include/abg-dwarf-reader.h (add_read_context_suppressions): Declare new function. * src/abg-dwarf-reader.cc: Use the new private abg-suppression-priv.h header file. (read_context::supprs_): New data member. (read_context::get_suppressions): New member function. (read_context::get_die_source): Make this const. (read_context::tu_die_imported_unit_points_map): Add a const overload. (read_context::cur_transl_unit): Renamed current_translation_unit unit into this; (read_context::cur_tu): Remove or rename into cur_transl_unit. (get_scope_for_die, build_translation_unit_and_add_to_ir) (build_enum_type, build_pointer_type_def, build_reference_type) (build_function_type, build_array_type, build_function_decl): Adjust. (read_context::{suppression_can_match, suppression_matches_function_sym_name, suppression_matches_function_name, suppression_matches_variable_sym_name, suppression_matches_variable_name, suppression_matches_type_name_or_location, suppression_matches_type_name}): Add member functions. (die_signed_constant_attribute): Remove this as dead code. (die_location, die_loc_and_name) (find_import_unit_point_between_dies) (find_import_unit_point_before_die, get_parent_die): Make the read_context& parameter be const and adjust as required. (build_var_decl_if_not_suppressed, function_is_suppressed) (variable_is_suppressed, type_is_suppressed): Define new static functions. (add_read_context_suppressions): Define new function. (build_class_type_and_add_to_ir): Do not add suppressed static data members to the IR. (build_ir_node_from_die): Do not add suppressed enum types, class types, variables or functions to the IR. Adjust for the read_context::cur_tu -> read_context::cur_transl_unit rename. * include/abg-reader.h (read_context_sptr): Declare new type. (create_native_xml_read_context, read_corpus_from_input) (add_read_context_suppressions): Declare new functions. * src/abg-reader.cc: Include the new private abg-suppression-priv.h header file. (read_context::m_exported_decls_builder): Renamed m_exported_decls_builder_ into this. (read_context::get_exported_decls_builder): Adjust. (read_context::get_cur_scope): Make this const. (read_location): Take a const read_context and adjust. (read_corpus_from_input): Make this non-static. (build_namespace_decl): Don't abort if trying to add an artifact to the IR doesn't succeed. It might be suppressed now. (read_context::{m_path, m_supprs}): New data members. (read_context::{g,s}et_path): New member functions. (read_context::{get_suppressions, suppression_matches_function_name, suppression_can_match, suppression_matches_function_name, suppression_matches_function_sym_name, suppression_matches_variable_name, suppression_matches_variable_sym_name, suppression_matches_type_name_or_location}): Likewise. (add_read_context_suppressions, create_native_xml_read_context) (read_corpus_from_native_xml): New functions. (build_function_decl_if_not_suppressed, function_is_suppressed) (type_is_suppressed, build_var_decl_if_not_suppressed) (variable_is_suppressed, build_enum_type_decl_if_not_suppressed) (build_class_decl_if_not_suppressed): New static functions. (build_class_decl): Add member types that are being built early, so that their sub-types can be evaluated for suppression. Do not add suppressed static data members or suppressed member functions to the IR. (build_type): Do not add an enum type or a class type to the IR if they are suppressed. (handle_enum_type_decl): Do not add an enum type to the IR if its suppressed. (handle_var_decl): Likewise for a variable decl. (handle_function_decl): Likewise for a function decl. (handle_class_decl): Likewise for a class decl. * src/abg-tools-utils.cc (handle_fts_entry): Drop suppressed ABI from the IR. * tools/abidiff.cc (display_usage): Fix help strings for --headers-dirs{1,2}. (set_suppressions): New static function. (main): Adjust. Release the memory used by read_context early. * tools/abidw.cc (options::{headers_dir, suppression_paths}): (display_usage): New help strings for the new --header-dir and --suppressions options. (parse_command_line): Parse the new --header-dir and --suppressions options. (maybe_check_suppression_files, set_suppressions): New static functions. (main): Use the two new functions above. Free the memory used by the read context before working with the corpus. * tools/abilint.cc (options::suppression_paths): (display_usage): New help strings for the new --header-dir and --suppressions options. (parse_command_line): Parse the new --header-dir and --suppressions options. (maybe_check_suppression_files, set_suppressions): New static functions. (main): Use the two new functions above. Free the memory used by the read context before working with the corpus. * tests/data/test-diff-suppr/test24-soname-suppr-{2,3].txt: Adjust. * tests/data/test-diff-suppr/test29-suppr-6.txt: Likewise. * tests/data/test-diff-suppr/test29-suppr-8.txt: Likewise. * tests/data/test-diff-suppr/libtest31-v{0,1}.so: New test input. * tests/data/test-diff-suppr/libtest31.suppr: Likewise * tests/data/test-diff-suppr/libtest32-v{0,1}.so: Likewise. * tests/data/test-diff-suppr/libtest32-0.suppr: Likewise. * tests/data/test-diff-suppr/libtest33-v{0,1}.so: Likewise. * tests/data/test-diff-suppr/test31-report-{0,1}.txt: Likewise. * tests/data/test-diff-suppr/test31-v{0,1}.cc: Likewise. * tests/data/test-diff-suppr/test32-report-{0,1}.txt: Likewise. * tests/data/test-diff-suppr/test32-v{0,1}.c: Likewise. * tests/data/test-diff-suppr/test33-suppr-1.txt: Likewise. * tests/data/test-diff-suppr/test33-v{0,1}.cc: Likewise. * tests/data/test-diff-suppr/test33-v{0,1}.h: Likewise. * tests/data/test-read-dwarf/libtest24-drop-fns-2.so.abi: Likewise. * tests/data/test-read-dwarf/libtest24-drop-fns.so: Likewise. * tests/data/test-read-dwarf/libtest24-drop-fns.so.abi: Likewise. * tests/data/test-read-dwarf/test24-drop-fns-0.suppr: Likewise. * tests/data/test-read-dwarf/test24-drop-fns.cc: Likewise. * tests/data/test-read-write/test28-drop-std-fns.abignore: Likewise. * tests/data/test-read-write/test28-drop-std-vars.abignore: Likewise. * tests/data/test-read-write/test28-without-std-fns-ref.xml: Likewise. * tests/data/test-read-write/test28-without-std-fns.xml: Likewise. * tests/data/test-read-write/test28-without-std-vars-ref.xml: Likewise. * tests/data/test-read-write/test28-without-std-vars.xml: Likewise. * tests/data/test-read-write/test28.xml: Likewise. * tests/data/Makefile.am: Add the new test artifacts to source distribution. * tests/test-diff-suppr.cc (in_out_spec): Take the new test inputs into account. * tests/test-read-dwarf.cc (Inoutspec::in_suppr_spec_path): New data member. (in_out_spec): Adjust. The new test inputs into account. (set_suppressions): New static function. (handle_in_out_spec): Adjust. * tests/test-read-write.cc (Inoutspec::{in_suppr_spec_path, ref_out_path}): New data members. (in_out_spec): Adjust. Take new test inputs into account. (main): Adjust. Signed-off-by: Dodji Seketeli <dodji@redhat.com>
327 lines
8.3 KiB
C++
327 lines
8.3 KiB
C++
// -*- Mode: C++ -*-
|
|
//
|
|
// Copyright (C) 2013-2016 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/>.
|
|
|
|
/// @file read an XML corpus file (in the native Abigail XML format),
|
|
/// save it back and diff the resulting XML file against the input
|
|
/// file. They should be identical.
|
|
|
|
#include <string>
|
|
#include <fstream>
|
|
#include <iostream>
|
|
#include <cstdlib>
|
|
#include <cstring>
|
|
#include "abg-ir.h"
|
|
#include "abg-reader.h"
|
|
#include "abg-writer.h"
|
|
#include "abg-tools-utils.h"
|
|
#include "test-utils.h"
|
|
|
|
using std::string;
|
|
using std::ofstream;
|
|
using std::cerr;
|
|
|
|
using abigail::tools_utils::file_type;
|
|
using abigail::tools_utils::check_file;
|
|
using abigail::tools_utils::guess_file_type;
|
|
using abigail::tests::get_build_dir;
|
|
using abigail::ir::environment;
|
|
using abigail::ir::environment_sptr;
|
|
using abigail::translation_unit_sptr;
|
|
using abigail::corpus_sptr;
|
|
using abigail::xml_reader::read_translation_unit_from_file;
|
|
using abigail::xml_reader::read_corpus_from_native_xml_file;
|
|
using abigail::xml_writer::write_translation_unit;
|
|
using abigail::xml_writer::write_corpus_to_native_xml;
|
|
|
|
/// This is an aggregate that specifies where a test shall get its
|
|
/// input from, and where it shall write its ouput to.
|
|
struct InOutSpec
|
|
{
|
|
const char* in_path;
|
|
const char* in_suppr_spec_path;
|
|
const char* ref_out_path;
|
|
const char* out_path;
|
|
};// end struct InOutSpec
|
|
|
|
|
|
InOutSpec in_out_specs[] =
|
|
{
|
|
{
|
|
"data/test-read-write/test0.xml",
|
|
"",
|
|
"data/test-read-write/test0.xml",
|
|
"output/test-read-write/test0.xml"
|
|
},
|
|
{
|
|
"data/test-read-write/test1.xml",
|
|
"",
|
|
"data/test-read-write/test1.xml",
|
|
"output/test-read-write/test1.xml"
|
|
},
|
|
{
|
|
"data/test-read-write/test2.xml",
|
|
"",
|
|
"data/test-read-write/test2.xml",
|
|
"output/test-read-write/test2.xml"
|
|
},
|
|
{
|
|
"data/test-read-write/test3.xml",
|
|
"",
|
|
"data/test-read-write/test3.xml",
|
|
"output/test-read-write/test3.xml"
|
|
},
|
|
{
|
|
"data/test-read-write/test4.xml",
|
|
"",
|
|
"data/test-read-write/test4.xml",
|
|
"output/test-read-write/test4.xml"
|
|
},
|
|
{
|
|
"data/test-read-write/test5.xml",
|
|
"",
|
|
"data/test-read-write/test5.xml",
|
|
"output/test-read-write/test5.xml"
|
|
},
|
|
{
|
|
"data/test-read-write/test6.xml",
|
|
"",
|
|
"data/test-read-write/test6.xml",
|
|
"output/test-read-write/test6.xml"
|
|
},
|
|
{
|
|
"data/test-read-write/test7.xml",
|
|
"",
|
|
"data/test-read-write/test7.xml",
|
|
"output/test-read-write/test7.xml"
|
|
},
|
|
{
|
|
"data/test-read-write/test8.xml",
|
|
"",
|
|
"data/test-read-write/test8.xml",
|
|
"output/test-read-write/test8.xml"
|
|
},
|
|
{
|
|
"data/test-read-write/test9.xml",
|
|
"",
|
|
"data/test-read-write/test9.xml",
|
|
"output/test-read-write/test9.xml"
|
|
},
|
|
{
|
|
"data/test-read-write/test10.xml",
|
|
"",
|
|
"data/test-read-write/test10.xml",
|
|
"output/test-read-write/test10.xml"
|
|
},
|
|
{
|
|
"data/test-read-write/test11.xml",
|
|
"",
|
|
"data/test-read-write/test11.xml",
|
|
"output/test-read-write/test11.xml"
|
|
},
|
|
{
|
|
"data/test-read-write/test12.xml",
|
|
"",
|
|
"data/test-read-write/test12.xml",
|
|
"output/test-read-write/test12.xml"
|
|
},
|
|
{
|
|
"data/test-read-write/test13.xml",
|
|
"",
|
|
"data/test-read-write/test13.xml",
|
|
"output/test-read-write/test13.xml"
|
|
},
|
|
{
|
|
"data/test-read-write/test14.xml",
|
|
"",
|
|
"data/test-read-write/test14.xml",
|
|
"output/test-read-write/test14.xml"
|
|
},
|
|
{
|
|
"data/test-read-write/test15.xml",
|
|
"",
|
|
"data/test-read-write/test15.xml",
|
|
"output/test-read-write/test15.xml"
|
|
},
|
|
{
|
|
"data/test-read-write/test16.xml",
|
|
"",
|
|
"data/test-read-write/test16.xml",
|
|
"output/test-read-write/test16.xml"
|
|
},
|
|
{
|
|
"data/test-read-write/test17.xml",
|
|
"",
|
|
"data/test-read-write/test17.xml",
|
|
"output/test-read-write/test17.xml"
|
|
},
|
|
{
|
|
"data/test-read-write/test18.xml",
|
|
"",
|
|
"data/test-read-write/test18.xml",
|
|
"output/test-read-write/test18.xml"
|
|
},
|
|
{
|
|
"data/test-read-write/test19.xml",
|
|
"",
|
|
"data/test-read-write/test19.xml",
|
|
"output/test-read-write/test19.xml"
|
|
},
|
|
{
|
|
"data/test-read-write/test20.xml",
|
|
"",
|
|
"data/test-read-write/test20.xml",
|
|
"output/test-read-write/test20.xml"
|
|
},
|
|
{
|
|
"data/test-read-write/test21.xml",
|
|
"",
|
|
"data/test-read-write/test21.xml",
|
|
"output/test-read-write/test21.xml"
|
|
},
|
|
{
|
|
"data/test-read-write/test22.xml",
|
|
"",
|
|
"data/test-read-write/test22.xml",
|
|
"output/test-read-write/test22.xml"
|
|
},
|
|
{
|
|
"data/test-read-write/test23.xml",
|
|
"",
|
|
"data/test-read-write/test23.xml",
|
|
"output/test-read-write/test23.xml"
|
|
},
|
|
{
|
|
"data/test-read-write/test24.xml",
|
|
"",
|
|
"data/test-read-write/test24.xml",
|
|
"output/test-read-write/test24.xml"
|
|
},
|
|
{
|
|
"data/test-read-write/test25.xml",
|
|
"",
|
|
"data/test-read-write/test25.xml",
|
|
"output/test-read-write/test25.xml"
|
|
},
|
|
{
|
|
"data/test-read-write/test26.xml",
|
|
"",
|
|
"data/test-read-write/test26.xml",
|
|
"output/test-read-write/test26.xml"
|
|
},
|
|
{
|
|
"data/test-read-write/test27.xml",
|
|
"",
|
|
"data/test-read-write/test27.xml",
|
|
"output/test-read-write/test27.xml"
|
|
},
|
|
{
|
|
"data/test-read-write/test28.xml",
|
|
"data/test-read-write/test28-drop-std-fns.abignore",
|
|
"data/test-read-write/test28-without-std-fns-ref.xml",
|
|
"output/test-read-write/test28-without-std-fns.xml"
|
|
},
|
|
{
|
|
"data/test-read-write/test28.xml",
|
|
"data/test-read-write/test28-drop-std-vars.abignore",
|
|
"data/test-read-write/test28-without-std-vars-ref.xml",
|
|
"output/test-read-write/test28-without-std-vars.xml"
|
|
},
|
|
// This should be the last entry.
|
|
{NULL, NULL, NULL, NULL}
|
|
};
|
|
|
|
/// Walk the array of InOutSpecs above, read the input files it points
|
|
/// to, write it into the output it points to and diff them.
|
|
int
|
|
main()
|
|
{
|
|
unsigned result = 1;
|
|
|
|
bool is_ok = true;
|
|
string in_path, out_path, in_suppr_spec_path, ref_out_path;
|
|
for (InOutSpec* s = in_out_specs; s->in_path; ++s)
|
|
{
|
|
string input_suffix(s->in_path);
|
|
in_path =
|
|
string(abigail::tests::get_src_dir()) + "/tests/" + input_suffix;
|
|
|
|
if (!check_file(in_path, cerr))
|
|
return true;
|
|
|
|
string ref_out_path_suffix(s->ref_out_path);
|
|
ref_out_path =
|
|
string(abigail::tests::get_src_dir())
|
|
+ "/tests/" + ref_out_path_suffix;
|
|
|
|
if (!check_file(ref_out_path, cerr))
|
|
return true;
|
|
|
|
if (s->in_suppr_spec_path && strcmp(s->in_suppr_spec_path, ""))
|
|
{
|
|
in_suppr_spec_path = string(s->in_suppr_spec_path);
|
|
in_suppr_spec_path =
|
|
string(abigail::tests::get_src_dir())
|
|
+ "/tests/"
|
|
+ in_suppr_spec_path;
|
|
}
|
|
else
|
|
in_suppr_spec_path.clear();
|
|
|
|
environment_sptr env(new environment);
|
|
translation_unit_sptr tu;
|
|
corpus_sptr corpus;
|
|
|
|
file_type t = guess_file_type(in_path);
|
|
if (t == abigail::tools_utils::FILE_TYPE_UNKNOWN)
|
|
{
|
|
cerr << in_path << "is an unknown file type\n";
|
|
is_ok = false;
|
|
continue;
|
|
}
|
|
|
|
string output_suffix(s->out_path);
|
|
out_path =
|
|
string(abigail::tests::get_build_dir()) + "/tests/" + output_suffix;
|
|
if (!abigail::tools_utils::ensure_parent_dir_created(out_path))
|
|
{
|
|
cerr << "Could not create parent director for " << out_path;
|
|
is_ok = false;
|
|
return result;
|
|
}
|
|
|
|
string abilint = string(get_build_dir()) + "/tools/abilint";
|
|
if (!in_suppr_spec_path.empty())
|
|
abilint +=string(" --suppr ") + in_suppr_spec_path;
|
|
string cmd = abilint + " " + in_path + " > " + out_path;
|
|
|
|
if (system(cmd.c_str()))
|
|
{
|
|
cerr << "ABI XML file doesn't pass abilint: " << out_path << "\n";
|
|
is_ok &= false;
|
|
}
|
|
|
|
cmd = "diff -u " + ref_out_path + " " + out_path;
|
|
if (system(cmd.c_str()))
|
|
is_ok &= false;
|
|
}
|
|
|
|
return !is_ok;
|
|
}
|