Backport r248089
2017-06-22 Martin Liska <mliska@suse.cz> Backport from mainline 2017-05-16 Martin Liska <mliska@suse.cz> PR ipa/79849. PR ipa/79850. * ipa-devirt.c (warn_types_mismatch): Fix typo. (odr_types_equivalent_p): Likewise. From-SVN: r249547
This commit is contained in:
parent
1c5214501b
commit
294842cb2e
|
@ -1,3 +1,13 @@
|
||||||
|
2017-06-22 Martin Liska <mliska@suse.cz>
|
||||||
|
|
||||||
|
Backport from mainline
|
||||||
|
2017-05-16 Martin Liska <mliska@suse.cz>
|
||||||
|
|
||||||
|
PR ipa/79849.
|
||||||
|
PR ipa/79850.
|
||||||
|
* ipa-devirt.c (warn_types_mismatch): Fix typo.
|
||||||
|
(odr_types_equivalent_p): Likewise.
|
||||||
|
|
||||||
2017-06-22 Martin Liska <mliska@suse.cz>
|
2017-06-22 Martin Liska <mliska@suse.cz>
|
||||||
|
|
||||||
Backport from mainline
|
Backport from mainline
|
||||||
|
|
|
@ -1226,7 +1226,7 @@ warn_types_mismatch (tree t1, tree t2, location_t loc1, location_t loc2)
|
||||||
if (types_odr_comparable (t1, t2, true)
|
if (types_odr_comparable (t1, t2, true)
|
||||||
&& types_same_for_odr (t1, t2, true))
|
&& types_same_for_odr (t1, t2, true))
|
||||||
inform (loc_t1,
|
inform (loc_t1,
|
||||||
"type %qT itself violate the C++ One Definition Rule", t1);
|
"type %qT itself violates the C++ One Definition Rule", t1);
|
||||||
/* Prevent pointless warnings like "struct aa" should match "struct aa". */
|
/* Prevent pointless warnings like "struct aa" should match "struct aa". */
|
||||||
else if (TYPE_NAME (t1) == TYPE_NAME (t2)
|
else if (TYPE_NAME (t1) == TYPE_NAME (t2)
|
||||||
&& TREE_CODE (t1) == TREE_CODE (t2) && !loc_t2_useful)
|
&& TREE_CODE (t1) == TREE_CODE (t2) && !loc_t2_useful)
|
||||||
|
@ -1573,7 +1573,7 @@ odr_types_equivalent_p (tree t1, tree t2, bool warn, bool *warned,
|
||||||
if (DECL_ARTIFICIAL (f1))
|
if (DECL_ARTIFICIAL (f1))
|
||||||
break;
|
break;
|
||||||
warn_odr (t1, t2, f1, f2, warn, warned,
|
warn_odr (t1, t2, f1, f2, warn, warned,
|
||||||
G_("fields has different layout "
|
G_("fields have different layout "
|
||||||
"in another translation unit"));
|
"in another translation unit"));
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue