diff --git a/src/intel/compiler/brw_builder.h b/src/intel/compiler/brw_builder.h
index cc1f572eebf..5417cfdad8e 100644
--- a/src/intel/compiler/brw_builder.h
+++ b/src/intel/compiler/brw_builder.h
@@ -846,12 +846,12 @@ public:
 
    brw_shader *shader;
 
-   brw_inst *BREAK()    { return emit(BRW_OPCODE_BREAK); }
-   brw_inst *DO()       { return emit(BRW_OPCODE_DO); }
-   brw_inst *ENDIF()    { return emit(BRW_OPCODE_ENDIF); }
-   brw_inst *NOP()      { return emit(BRW_OPCODE_NOP); }
-   brw_inst *WHILE()    { return emit(BRW_OPCODE_WHILE); }
-   brw_inst *CONTINUE() { return emit(BRW_OPCODE_CONTINUE); }
+   brw_inst *BREAK()    const { return emit(BRW_OPCODE_BREAK); }
+   brw_inst *DO()       const { return emit(BRW_OPCODE_DO); }
+   brw_inst *ENDIF()    const { return emit(BRW_OPCODE_ENDIF); }
+   brw_inst *NOP()      const { return emit(BRW_OPCODE_NOP); }
+   brw_inst *WHILE()    const { return emit(BRW_OPCODE_WHILE); }
+   brw_inst *CONTINUE() const { return emit(BRW_OPCODE_CONTINUE); }
 
    bool has_writemask_all() const {
       return force_writemask_all;
diff --git a/src/intel/compiler/brw_from_nir.cpp b/src/intel/compiler/brw_from_nir.cpp
index cb37e4c3b2e..2a62b9034bc 100644
--- a/src/intel/compiler/brw_from_nir.cpp
+++ b/src/intel/compiler/brw_from_nir.cpp
@@ -469,7 +469,7 @@ brw_from_nir_emit_loop(nir_to_brw_state &ntb, nir_loop *loop)
    const brw_builder &bld = ntb.bld;
 
    assert(!nir_loop_has_continue_construct(loop));
-   bld.emit(BRW_OPCODE_DO);
+   bld.DO();
 
    brw_from_nir_emit_cf_list(ntb, &loop->body);
 
@@ -7818,7 +7818,7 @@ brw_test_dispatch_packing(const brw_builder &bld)
       /* This will loop forever if the dispatch mask doesn't have the expected
        * form '2^n-1', in which case tmp will be non-zero.
        */
-      bld.emit(BRW_OPCODE_DO);
+      bld.DO();
       bld.CMP(bld.null_reg_ud(), tmp, brw_imm_ud(0), BRW_CONDITIONAL_NZ);
       set_predicate(BRW_PREDICATE_NORMAL, bld.emit(BRW_OPCODE_WHILE));
    }
diff --git a/src/intel/compiler/test_lower_scoreboard.cpp b/src/intel/compiler/test_lower_scoreboard.cpp
index 004994094bd..e60b8650fbb 100644
--- a/src/intel/compiler/test_lower_scoreboard.cpp
+++ b/src/intel/compiler/test_lower_scoreboard.cpp
@@ -505,7 +505,7 @@ TEST_F(scoreboard_test, loop1)
    brw_reg x = bld.vgrf(BRW_TYPE_D);
    bld.XOR(   x, g[1], g[2]);
 
-   bld.emit(BRW_OPCODE_DO);
+   bld.DO();
 
    bld.ADD(   x, g[1], g[2]);
    bld.emit(BRW_OPCODE_WHILE)->predicate = BRW_PREDICATE_NORMAL;
@@ -538,7 +538,7 @@ TEST_F(scoreboard_test, loop2)
    bld.XOR(g[4], g[1], g[2]);
    bld.XOR(g[5], g[1], g[2]);
 
-   bld.emit(BRW_OPCODE_DO);
+   bld.DO();
 
    bld.ADD(   x, g[1], g[2]);
    bld.emit(BRW_OPCODE_WHILE)->predicate = BRW_PREDICATE_NORMAL;
@@ -570,7 +570,7 @@ TEST_F(scoreboard_test, loop3)
    brw_reg x = bld.vgrf(BRW_TYPE_D);
    bld.XOR(   x, g[1], g[2]);
 
-   bld.emit(BRW_OPCODE_DO);
+   bld.DO();
 
    /* For the ADD in the loop body this extra distance will always apply. */
    bld.XOR(g[3], g[1], g[2]);