diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2023-11-16 16:05:44 +0100 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2023-11-16 16:05:44 +0100 |
| commit | 56eddc3cb1affe014d567f8460e5a76ca079f842 (patch) | |
| tree | 7363e0f189ac7276fcb1bd2660f8478a45fd00d6 /scripts/gcc-plugins/randomize_layout_plugin.c | |
| parent | 3185d57cfcd34fadbe28f4ed57a6cb5122277ece (diff) | |
| parent | 7475e51b87969e01a6812eac713a1c8310372e8a (diff) | |
| download | linux-56eddc3cb1affe014d567f8460e5a76ca079f842.tar.gz linux-56eddc3cb1affe014d567f8460e5a76ca079f842.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
No conflicts.
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'scripts/gcc-plugins/randomize_layout_plugin.c')
| -rw-r--r-- | scripts/gcc-plugins/randomize_layout_plugin.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/scripts/gcc-plugins/randomize_layout_plugin.c b/scripts/gcc-plugins/randomize_layout_plugin.c index 366395cab490..910bd21d08f4 100644 --- a/scripts/gcc-plugins/randomize_layout_plugin.c +++ b/scripts/gcc-plugins/randomize_layout_plugin.c @@ -278,8 +278,6 @@ static bool is_flexible_array(const_tree field) { const_tree fieldtype; const_tree typesize; - const_tree elemtype; - const_tree elemsize; fieldtype = TREE_TYPE(field); typesize = TYPE_SIZE(fieldtype); @@ -287,20 +285,12 @@ static bool is_flexible_array(const_tree field) if (TREE_CODE(fieldtype) != ARRAY_TYPE) return false; - elemtype = TREE_TYPE(fieldtype); - elemsize = TYPE_SIZE(elemtype); - /* size of type is represented in bits */ if (typesize == NULL_TREE && TYPE_DOMAIN(fieldtype) != NULL_TREE && TYPE_MAX_VALUE(TYPE_DOMAIN(fieldtype)) == NULL_TREE) return true; - if (typesize != NULL_TREE && - (TREE_CONSTANT(typesize) && (!tree_to_uhwi(typesize) || - tree_to_uhwi(typesize) == tree_to_uhwi(elemsize)))) - return true; - return false; } |