Merge tag 'virtio-fs-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse

[linux.git] / scripts / gcc-plugins / sancov_plugin.c

diff --git a/scripts/gcc-plugins/sancov_plugin.c b/scripts/gcc-plugins/sancov_plugin.c
index 70f5fe0d590a3b639e8c98ef045acd640efadf0c..0f98634c20a097697cec9849dc9e4b338cd5e5c9 100644 (file)
--- a/scripts/gcc-plugins/sancov_plugin.c
+++ b/scripts/gcc-plugins/sancov_plugin.c
@@ -89,7 +89,6 @@ static void sancov_start_unit(void __unused *gcc_data, void __unused *user_data)
 __visible int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
 {
        int i;
-       struct register_pass_info sancov_plugin_pass_info;
        const char * const plugin_name = plugin_info->base_name;
        const int argc = plugin_info->argc;
        const struct plugin_argument * const argv = plugin_info->argv;
@@ -107,14 +106,11 @@ __visible int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gc
        };
 
        /* BBs can be split afterwards?? */
-       sancov_plugin_pass_info.pass                            = make_sancov_pass();
 #if BUILDING_GCC_VERSION >= 4009
-       sancov_plugin_pass_info.reference_pass_name             = "asan";
+       PASS_INFO(sancov, "asan", 0, PASS_POS_INSERT_BEFORE);
 #else
-       sancov_plugin_pass_info.reference_pass_name             = "nrv";
+       PASS_INFO(sancov, "nrv", 1, PASS_POS_INSERT_BEFORE);
 #endif
-       sancov_plugin_pass_info.ref_pass_instance_number        = 0;
-       sancov_plugin_pass_info.pos_op                          = PASS_POS_INSERT_BEFORE;
 
        if (!plugin_default_version_check(version, &gcc_version)) {
                error(G_("incompatible gcc/plugin versions"));
@@ -137,7 +133,7 @@ __visible int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gc
 #if BUILDING_GCC_VERSION < 6000
        register_callback(plugin_name, PLUGIN_START_UNIT, &sancov_start_unit, NULL);
        register_callback(plugin_name, PLUGIN_REGISTER_GGC_ROOTS, NULL, (void *)&gt_ggc_r_gt_sancov);
-       register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &sancov_plugin_pass_info);
+       register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &sancov_pass_info);
 #endif
 
        return 0;