mirror of
git://sourceware.org/git/libabigail.git
synced 2025-03-07 15:17:39 +00:00
1b75fd3eac
Until now, two types that are different were considered compatible if
one type is a typedef of the other. This is useful because two
different types, if compatible, are not ABI-incompatible. This patch
extends the concept of compatible types to types which might have
sub-types that are typedefs of each others, including function types.
Note implementing this required that I fixed various other things left
and right. Like style fixes, crash avoiding fixes, etc.
* include/abg-fwd.h (is_reference_type, is_function_type)
(is_method_type): Declare new predicates.
* include/abg-ir.h (class qualified_type_def): Pimpl this class.
(qualified_type_def::qualified_type_def): Use the convenience
type_base_sptr typedef.
(qualified_type_def::{get_cv_quals, set_cv_quals}): Use the
qualified_type_def::CV type rather than char.
(qualified_type_def::get_underlying_type): Use the convenience
type_base_sptr typedef.
(pointer_type_def::pointer_type_def): Likewise.
(function_decl::parameter::parameter): Add a new constructor.
* src/abg-ir.cc (is_reference_type, is_function_type)
(is_method_type): Define new predicates.
(class qualified_type_def::priv): Define this new private type,
for the purpose of Pimpl-ifying the qualified_type_def class.
(qualified_type_def::{qualified_type_def, build_name,
get_cv_quals_string_prefix, get_underlying_type}): Adjust for the
purpose of Pimpl-ifying the qualified_type_def class.
(equals): In the qualified_type_def, reference_type_def overloads,
trust the fact that we have operator== overload for the
type_base_sptr. This avoids crashes for when the (possible)
underlying type is null.
(pointer_type_def::operator==): Likewise.
(strip_typedef): Make this recursively strip
typedefs from sub-types.
(types_are_compatible): Handle null types.
(qualified_type_def::{get_cv_quals, set_cv_quals}): Handle
qualified_type_def::CV rather than char.
(pointer_type_def::pointer_type_def): Use the convenience
type_base_sptr typedef.
* include/abg-comparison.h (distinct_diff::compatible_child_diff):
Declare new member function.
* src/abg-comparison.cc (distinct_diff::compatible_child_diff):
Define new member function.
(distinct_diff::chain_into_hierarchy):
Chain the compatible child diff node that might be present.
(distinct_diff::report): Now when a distinct diff carries a
compatible change, mention it in the report.
* src/abg-comp-filter.cc (is_compatible_change): A compatible
change can now involve types that are not typedefs. Only their
sub-types need to be involved with typedef-ness.
* tests/data/test-diff-dwarf/test{2,4,5}-report.txt: Adjust.
* tests/data/test-diff-filter/libtest21-compatible-vars-v0.so: New
test data input.
* tests/data/test-diff-filter/libtest21-compatible-vars-v1.so: Likewise.
* tests/data/test-diff-filter/test21-compatible-vars-report-0.txt Likewise.
* tests/data/test-diff-filter/test21-compatible-vars-report-1.txt Likewise.
* tests/data/test-diff-filter/test21-compatible-vars-v0.cc: Source
code for the first data input binary above.
* tests/data/test-diff-filter/test21-compatible-vars-v1.cc: Source
code for the second data input binary above.
* tests/data/test-diff-filter/libtest22-compatible-fns-v0.so: New
test data input.
* tests/data/test-diff-filter/libtest22-compatible-fns-v1.so Likewise.
* tests/data/test-diff-filter/test22-compatible-fns-report-0.txt:
New test data input.
* tests/data/test-diff-filter/test22-compatible-fns-report-1.txt: Likewise.
* tests/data/test-diff-filter/test22-compatible-fns-v0.c: Source
code for the first test data input binary above.
* tests/data/test-diff-filter/test22-compatible-fns-v1.c: Source
code for the second test data input binary above.
* tests/data/Makefile.am: Add the new test input data to source
distribution.
* tests/test-diff-filter.cc (in_out_specs): Add the new test data
input above to the list of test data this harness has to be run
over.
Signed-off-by: Dodji Seketeli <dodji@redhat.com>
329 lines
9.8 KiB
C++
329 lines
9.8 KiB
C++
// -*- Mode: C++ -*-
|
|
//
|
|
// Copyright (C) 2013-2014 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
|
|
///
|
|
/// This program runs a diff between input ELF files containing DWARF
|
|
/// debugging information and compares the resulting report with a
|
|
/// reference report. If the resulting report is different from the
|
|
/// reference report, the test has failed. Note that the comparison
|
|
/// is done using the abidiff command line comparison tool.
|
|
///
|
|
/// The set of input files and reference reports to consider should be
|
|
/// present in the source distribution.
|
|
|
|
#include <string>
|
|
#include <fstream>
|
|
#include <iostream>
|
|
#include <cstdlib>
|
|
#include "abg-tools-utils.h"
|
|
#include "test-utils.h"
|
|
|
|
using std::string;
|
|
using std::cerr;
|
|
|
|
/// 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_elfv0_path;
|
|
const char* in_elfv1_path;
|
|
const char* abidiff_options;
|
|
const char* in_report_path;
|
|
const char* out_report_path;
|
|
}; // end struct InOutSpec;
|
|
|
|
InOutSpec in_out_specs[] =
|
|
{
|
|
{
|
|
"data/test-diff-filter/test0-v0.o",
|
|
"data/test-diff-filter/test0-v1.o",
|
|
"--no-linkage-name",
|
|
"data/test-diff-filter/test0-report.txt",
|
|
"output/test-diff-filter/test0-report.txt",
|
|
},
|
|
{
|
|
"data/test-diff-filter/test0-v0.o",
|
|
"data/test-diff-filter/test0-v1.o",
|
|
"--harmless --no-linkage-name",
|
|
"data/test-diff-filter/test01-report.txt",
|
|
"output/test-diff-filter/test01-report.txt",
|
|
},
|
|
{
|
|
"data/test-diff-filter/test1-v0.o",
|
|
"data/test-diff-filter/test1-v1.o",
|
|
"--no-linkage-name",
|
|
"data/test-diff-filter/test1-report.txt",
|
|
"output/test-diff-filter/test1-report.txt",
|
|
},
|
|
{
|
|
"data/test-diff-filter/test2-v0.o",
|
|
"data/test-diff-filter/test2-v1.o",
|
|
"--no-linkage-name",
|
|
"data/test-diff-filter/test2-report.txt",
|
|
"output/test-diff-filter/test2-report.txt",
|
|
},
|
|
{
|
|
"data/test-diff-filter/test3-v0.o",
|
|
"data/test-diff-filter/test3-v1.o",
|
|
"--no-linkage-name",
|
|
"data/test-diff-filter/test3-report.txt",
|
|
"output/test-diff-filter/test3-report.txt",
|
|
},
|
|
{
|
|
"data/test-diff-filter/test4-v0.o",
|
|
"data/test-diff-filter/test4-v1.o",
|
|
"--no-linkage-name",
|
|
"data/test-diff-filter/test4-report.txt",
|
|
"output/test-diff-filter/test4-report.txt",
|
|
},
|
|
{
|
|
"data/test-diff-filter/test5-v0.o",
|
|
"data/test-diff-filter/test5-v1.o",
|
|
"--no-linkage-name",
|
|
"data/test-diff-filter/test5-report.txt",
|
|
"output/test-diff-filter/test5-report.txt",
|
|
},
|
|
{
|
|
"data/test-diff-filter/test6-v0.o",
|
|
"data/test-diff-filter/test6-v1.o",
|
|
"--no-linkage-name",
|
|
"data/test-diff-filter/test6-report.txt",
|
|
"output/test-diff-filter/test6-report.txt",
|
|
},
|
|
{
|
|
"data/test-diff-filter/test7-v0.o",
|
|
"data/test-diff-filter/test7-v1.o",
|
|
"--no-linkage-name",
|
|
"data/test-diff-filter/test7-report.txt",
|
|
"output/test-diff-filter/test7-report.txt",
|
|
},
|
|
{
|
|
"data/test-diff-filter/test8-v0.o",
|
|
"data/test-diff-filter/test8-v1.o",
|
|
"--no-linkage-name",
|
|
"data/test-diff-filter/test8-report.txt",
|
|
"output/test-diff-filter/test8-report.txt",
|
|
},
|
|
{
|
|
"data/test-diff-filter/test9-v0.o",
|
|
"data/test-diff-filter/test9-v1.o",
|
|
"--no-linkage-name",
|
|
"data/test-diff-filter/test9-report.txt",
|
|
"output/test-diff-filter/test9-report.txt",
|
|
},
|
|
{
|
|
"data/test-diff-filter/test10-v0.o",
|
|
"data/test-diff-filter/test10-v1.o",
|
|
"--no-linkage-name",
|
|
"data/test-diff-filter/test10-report.txt",
|
|
"output/test-diff-filter/test10-report.txt",
|
|
},
|
|
{
|
|
"data/test-diff-filter/test11-v0.o",
|
|
"data/test-diff-filter/test11-v1.o",
|
|
"--no-linkage-name",
|
|
"data/test-diff-filter/test11-report.txt",
|
|
"output/test-diff-filter/test11-report.txt",
|
|
},
|
|
{
|
|
"data/test-diff-filter/test12-v0.o",
|
|
"data/test-diff-filter/test12-v1.o",
|
|
"--no-linkage-name",
|
|
"data/test-diff-filter/test12-report.txt",
|
|
"output/test-diff-filter/test12-report.txt",
|
|
},
|
|
{
|
|
"data/test-diff-filter/test13-v0.o",
|
|
"data/test-diff-filter/test13-v1.o",
|
|
"--no-linkage-name",
|
|
"data/test-diff-filter/test13-report.txt",
|
|
"output/test-diff-filter/test13-report.txt",
|
|
},
|
|
{
|
|
"data/test-diff-filter/test14-v0.o",
|
|
"data/test-diff-filter/test14-v1.o",
|
|
"",
|
|
"data/test-diff-filter/test14-0-report.txt",
|
|
"output/test-diff-filter/test14-0-report.txt",
|
|
},
|
|
{
|
|
"data/test-diff-filter/test14-v0.o",
|
|
"data/test-diff-filter/test14-v1.o",
|
|
"--redundant",
|
|
"data/test-diff-filter/test14-1-report.txt",
|
|
"output/test-diff-filter/test14-1-report.txt",
|
|
},
|
|
{
|
|
"data/test-diff-filter/test15-v0.o",
|
|
"data/test-diff-filter/test15-v1.o",
|
|
"",
|
|
"data/test-diff-filter/test15-0-report.txt",
|
|
"output/test-diff-filter/test15-0-report.txt",
|
|
},
|
|
{
|
|
"data/test-diff-filter/test15-v0.o",
|
|
"data/test-diff-filter/test15-v1.o",
|
|
"--redundant",
|
|
"data/test-diff-filter/test15-1-report.txt",
|
|
"output/test-diff-filter/test15-1-report.txt",
|
|
},
|
|
{
|
|
"data/test-diff-filter/test16-v0.o",
|
|
"data/test-diff-filter/test16-v1.o",
|
|
"",
|
|
"data/test-diff-filter/test16-report.txt",
|
|
"output/test-diff-filter/test16-report.txt",
|
|
},
|
|
{
|
|
"data/test-diff-filter/test17-v0.o",
|
|
"data/test-diff-filter/test17-v1.o",
|
|
"",
|
|
"data/test-diff-filter/test17-0-report.txt",
|
|
"output/test-diff-filter/test17-0-report.txt",
|
|
},
|
|
{
|
|
"data/test-diff-filter/test17-v0.o",
|
|
"data/test-diff-filter/test17-v1.o",
|
|
"--redundant",
|
|
"data/test-diff-filter/test17-1-report.txt",
|
|
"output/test-diff-filter/test17-1-report.txt",
|
|
},
|
|
{
|
|
"data/test-diff-filter/test18-v0.o",
|
|
"data/test-diff-filter/test18-v1.o",
|
|
"",
|
|
"data/test-diff-filter/test18-report.txt",
|
|
"output/test-diff-filter/test18-report.txt",
|
|
},
|
|
{
|
|
"data/test-diff-filter/test19-enum-v0.o",
|
|
"data/test-diff-filter/test19-enum-v1.o",
|
|
"",
|
|
"data/test-diff-filter/test19-enum-report-0.txt",
|
|
"output/test-diff-filter/test19-enum-report-0.txt",
|
|
},
|
|
{
|
|
"data/test-diff-filter/test19-enum-v0.o",
|
|
"data/test-diff-filter/test19-enum-v1.o",
|
|
"--harmless",
|
|
"data/test-diff-filter/test19-enum-report-1.txt",
|
|
"output/test-diff-filter/test19-enum-report-1.txt",
|
|
},
|
|
{
|
|
"data/test-diff-filter/test20-inline-v0.o",
|
|
"data/test-diff-filter/test20-inline-v1.o",
|
|
"",
|
|
"data/test-diff-filter/test20-inline-report-0.txt",
|
|
"output/test-diff-filter/test20-inline-report-0.txt",
|
|
},
|
|
{
|
|
"data/test-diff-filter/test20-inline-v0.o",
|
|
"data/test-diff-filter/test20-inline-v1.o",
|
|
"--harmless",
|
|
"data/test-diff-filter/test20-inline-report-1.txt",
|
|
"output/test-diff-filter/test20-inline-report-1.txt",
|
|
},
|
|
{
|
|
"data/test-diff-filter/libtest21-compatible-vars-v0.so",
|
|
"data/test-diff-filter/libtest21-compatible-vars-v1.so",
|
|
"--harmless",
|
|
"data/test-diff-filter/test21-compatible-vars-report-0.txt",
|
|
"output/test-diff-filter/test21-compatible-vars-report-0.txt",
|
|
},
|
|
{
|
|
"data/test-diff-filter/libtest21-compatible-vars-v0.so",
|
|
"data/test-diff-filter/libtest21-compatible-vars-v1.so",
|
|
"",
|
|
"data/test-diff-filter/test21-compatible-vars-report-1.txt",
|
|
"output/test-diff-filter/test21-compatible-vars-report-1.txt",
|
|
},
|
|
{
|
|
"data/test-diff-filter/libtest22-compatible-fns-v0.so",
|
|
"data/test-diff-filter/libtest22-compatible-fns-v1.so",
|
|
"--harmless",
|
|
"data/test-diff-filter/test22-compatible-fns-report-0.txt",
|
|
"output/test-diff-filter/test22-compatible-fns-report-0.txt",
|
|
},
|
|
{
|
|
"data/test-diff-filter/libtest22-compatible-fns-v0.so",
|
|
"data/test-diff-filter/libtest22-compatible-fns-v1.so",
|
|
"",
|
|
"data/test-diff-filter/test22-compatible-fns-report-1.txt",
|
|
"output/test-diff-filter/test22-compatible-fns-report-1.txt",
|
|
},
|
|
// This should be the last entry
|
|
{NULL, NULL, NULL, NULL, NULL}
|
|
};
|
|
|
|
int
|
|
main()
|
|
{
|
|
using abigail::tests::get_src_dir;
|
|
using abigail::tests::get_build_dir;
|
|
using abigail::tools::ensure_parent_dir_created;
|
|
|
|
bool is_ok = true;
|
|
string in_elfv0_path, in_elfv1_path,
|
|
abidiff_options, abidiff, cmd,
|
|
ref_diff_report_path, out_diff_report_path;
|
|
|
|
for (InOutSpec* s = in_out_specs; s->in_elfv0_path; ++s)
|
|
{
|
|
in_elfv0_path = get_src_dir() + "/tests/" + s->in_elfv0_path;
|
|
in_elfv1_path = get_src_dir() + "/tests/" + s->in_elfv1_path;
|
|
abidiff_options = s->abidiff_options;
|
|
ref_diff_report_path = get_src_dir() + "/tests/" + s->in_report_path;
|
|
out_diff_report_path = get_build_dir() + "/tests/" + s->out_report_path;
|
|
|
|
if (!ensure_parent_dir_created(out_diff_report_path))
|
|
{
|
|
cerr << "could not create parent directory for "
|
|
<< out_diff_report_path;
|
|
is_ok = false;
|
|
continue;
|
|
}
|
|
|
|
abidiff = get_build_dir() + "/tools/abidiff";
|
|
abidiff += " " + abidiff_options;
|
|
|
|
cmd = abidiff + " " + in_elfv0_path + " " + in_elfv1_path;
|
|
cmd += " > " + out_diff_report_path;
|
|
|
|
bool abidiff_ok = true;
|
|
if (system(cmd.c_str()))
|
|
abidiff_ok = false;
|
|
|
|
if (abidiff_ok)
|
|
{
|
|
cmd = "diff -u " + ref_diff_report_path
|
|
+ " " + out_diff_report_path;
|
|
if (system(cmd.c_str()))
|
|
is_ok = false;
|
|
}
|
|
else
|
|
is_ok = false;
|
|
}
|
|
|
|
return !is_ok;
|
|
}
|