diff --git a/src/gallium/drivers/r600/sfn/sfn_nir_merge_stores.cpp b/src/gallium/drivers/r600/sfn/sfn_nir_merge_stores.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/gallium/drivers/r600/sfn/sfn_shader_fragment.cpp b/src/gallium/drivers/r600/sfn/sfn_shader_fragment.cpp
index 9a02fc2122f..4d1bc13b199 100644
--- a/src/gallium/drivers/r600/sfn/sfn_shader_fragment.cpp
+++ b/src/gallium/drivers/r600/sfn/sfn_shader_fragment.cpp
@@ -95,15 +95,14 @@ unsigned barycentric_ij_index(nir_intrinsic_instr *instr)
    case INTERP_MODE_SMOOTH:
    case INTERP_MODE_COLOR:
       return index;
-      break;
    case INTERP_MODE_NOPERSPECTIVE:
       return index + 3;
-      break;
    case INTERP_MODE_FLAT:
    case INTERP_MODE_EXPLICIT:
    default:
-      assert(0 && "unknown/unsupported mode for load_interpolated");
+      unreachable("unknown/unsupported mode for load_interpolated");
    }
+   return 0;
 }
 
 bool FragmentShaderFromNir::process_load_input(nir_intrinsic_instr *instr,