diff --git a/src/gallium/drivers/r600/sb/sb_shader.cpp b/src/gallium/drivers/r600/sb/sb_shader.cpp
index 321e24ea256..a01972d7d70 100644
--- a/src/gallium/drivers/r600/sb/sb_shader.cpp
+++ b/src/gallium/drivers/r600/sb/sb_shader.cpp
@@ -37,7 +37,7 @@ shader::shader(sb_context &sctx, shader_target t, unsigned id)
   pool(), all_nodes(), src_stats(), opt_stats(), errors(),
   optimized(), id(id),
   coal(*this), bbs(),
-  target(t), vt(ex), ex(*this), root(),
+  target(t), ex(*this), vt(ex), root(),
   compute_interferences(),
   has_alu_predication(),
   uses_gradients(), safe_math(), ngpr(), nstack(), dce_flags() {}
diff --git a/src/gallium/drivers/r600/sb/sb_shader.h b/src/gallium/drivers/r600/sb/sb_shader.h
index 19e55246c4f..ccc70fa8db2 100644
--- a/src/gallium/drivers/r600/sb/sb_shader.h
+++ b/src/gallium/drivers/r600/sb/sb_shader.h
@@ -293,9 +293,10 @@ public:
 
 	const shader_target target;
 
-	value_table vt;
 	expr_handler ex;
 
+	value_table vt;
+
 	container_node *root;
 
 	bool compute_interferences;