diff --git a/src/intel/compiler/brw_fs.cpp b/src/intel/compiler/brw_fs.cpp
index 1502a923f37..39420de55f3 100644
--- a/src/intel/compiler/brw_fs.cpp
+++ b/src/intel/compiler/brw_fs.cpp
@@ -5765,7 +5765,7 @@ fs_visitor::optimize()
 
    progress = false;
    OPT(brw_fs_lower_derivatives, *this);
-   OPT(lower_regioning);
+   OPT(brw_fs_lower_regioning, *this);
    if (progress) {
       if (OPT(brw_fs_opt_copy_propagation, *this))
          OPT(brw_fs_opt_algebraic, *this);
diff --git a/src/intel/compiler/brw_fs.h b/src/intel/compiler/brw_fs.h
index 67e410632b4..392dd206e63 100644
--- a/src/intel/compiler/brw_fs.h
+++ b/src/intel/compiler/brw_fs.h
@@ -273,7 +273,6 @@ public:
    void limit_dispatch_width(unsigned n, const char *msg);
    bool lower_uniform_pull_constant_loads();
    bool lower_load_payload();
-   bool lower_regioning();
    bool lower_find_live_channel();
    bool lower_scoreboard();
 
@@ -599,6 +598,7 @@ bool brw_fs_lower_derivatives(fs_visitor &s);
 bool brw_fs_lower_integer_multiplication(fs_visitor &s);
 bool brw_fs_lower_logical_sends(fs_visitor &s);
 bool brw_fs_lower_pack(fs_visitor &s);
+bool brw_fs_lower_regioning(fs_visitor &s);
 bool brw_fs_lower_simd_width(fs_visitor &s);
 bool brw_fs_lower_sub_sat(fs_visitor &s);
 
diff --git a/src/intel/compiler/brw_fs_lower_regioning.cpp b/src/intel/compiler/brw_fs_lower_regioning.cpp
index 3bff7770cd0..c70aef45da5 100644
--- a/src/intel/compiler/brw_fs_lower_regioning.cpp
+++ b/src/intel/compiler/brw_fs_lower_regioning.cpp
@@ -663,15 +663,15 @@ namespace {
 }
 
 bool
-fs_visitor::lower_regioning()
+brw_fs_lower_regioning(fs_visitor &s)
 {
    bool progress = false;
 
-   foreach_block_and_inst_safe(block, fs_inst, inst, cfg)
-      progress |= lower_instruction(this, block, inst);
+   foreach_block_and_inst_safe(block, fs_inst, inst, s.cfg)
+      progress |= lower_instruction(&s, block, inst);
 
    if (progress)
-      invalidate_analysis(DEPENDENCY_INSTRUCTIONS | DEPENDENCY_VARIABLES);
+      s.invalidate_analysis(DEPENDENCY_INSTRUCTIONS | DEPENDENCY_VARIABLES);
 
    return progress;
 }