diff options
| author | SpiritCroc <dev@spiritcroc.de> | 2020-02-20 16:15:19 +0100 |
|---|---|---|
| committer | SpiritCroc <dev@spiritcroc.de> | 2020-02-20 16:15:19 +0100 |
| commit | aba7fab93b0de56479c04e313f75eebd7e7d5769 (patch) | |
| tree | ea58d7766bfdbcd4d1aa3c842fd540c0c5a58866 /scripts/gcc-plugins/randomize_layout_plugin.c | |
| parent | 7d8883219cde3f0d993b6c87c180a9464b654d27 (diff) | |
| parent | d95bed04b9e6f49e0ff8454ed765b9e0ba1e8819 (diff) | |
Merge remote-tracking branch 'sony/aosp/LA.UM.7.1.r1' into q10.0-4.14q10.0-4.14
Change-Id: I130af189da62f8eaca8c732a2cf3d434b1c3f26d
Diffstat (limited to 'scripts/gcc-plugins/randomize_layout_plugin.c')
| -rw-r--r-- | scripts/gcc-plugins/randomize_layout_plugin.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/gcc-plugins/randomize_layout_plugin.c b/scripts/gcc-plugins/randomize_layout_plugin.c index c4a345c3715b..6ee49c973135 100644 --- a/scripts/gcc-plugins/randomize_layout_plugin.c +++ b/scripts/gcc-plugins/randomize_layout_plugin.c @@ -443,13 +443,13 @@ static int is_pure_ops_struct(const_tree node) if (node == fieldtype) continue; - if (!is_fptr(fieldtype)) - return 0; - - if (code != RECORD_TYPE && code != UNION_TYPE) + if (code == RECORD_TYPE || code == UNION_TYPE) { + if (!is_pure_ops_struct(fieldtype)) + return 0; continue; + } - if (!is_pure_ops_struct(fieldtype)) + if (!is_fptr(fieldtype)) return 0; } |