diff --git a/WORKSPACE b/WORKSPACE
index 9cfe398..a6ccdd3 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -15,9 +15,9 @@
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
-LLVM_COMMIT = "e990fa2170314b179ec025b68fd00fbe9aab398d"
+LLVM_COMMIT = "5657f93e788f093c70fb448dd6f9398b149df278"
 
-LLVM_SHA256 = "3d071fad8606faa555518b043e5100c4a03205ac09a503fe30f829fe024eb999"
+LLVM_SHA256 = "47f798395db279dba107a35bffe4c32551d58a5bb443f9cb94e4f309a778f46e"
 
 LLVM_BAZEL_TAG = "llvm-project-{commit}".format(commit = LLVM_COMMIT)
 
diff --git a/build_tools/llvm_version.txt b/build_tools/llvm_version.txt
index 8ac5f04..e532fc9 100644
--- a/build_tools/llvm_version.txt
+++ b/build_tools/llvm_version.txt
@@ -1,2 +1,2 @@
-e990fa2170314b179ec025b68fd00fbe9aab398d
+5657f93e788f093c70fb448dd6f9398b149df278
 
diff --git a/tests/lhlo-legalize-select-and-scatter.mlir b/tests/lhlo-legalize-select-and-scatter.mlir
index ba79ba4..78f894f 100644
--- a/tests/lhlo-legalize-select-and-scatter.mlir
+++ b/tests/lhlo-legalize-select-and-scatter.mlir
@@ -127,15 +127,14 @@ func @select_and_scatter(%arg: memref<112x112xf32>,
 
 
     // Depending on PRED, return ARG ivs & elem or current select ivs and value.
-    // CHECK:  [[IF_PRED_RES:%.*]]:4 = scf.if [[PRED]]
-    // CHECK:    scf.yield [[ARG_I]], [[ARG_J]], [[ARG_ELEM]], [[CTRUE]]
-    // CHECK:  } else {
-    // CHECK:    scf.yield [[SEL_I]], [[SEL_J]], [[SEL_VAL]], [[SEL_INIT]]
-    // CHECK:  }
+    // CHECK:  [[IF_PRED_RES0:%.*]] = select [[PRED]], [[ARG_I]], [[SEL_I]]
+    // CHECK:  [[IF_PRED_RES1:%.*]] = select [[PRED]], [[ARG_J]], [[SEL_J]]
+    // CHECK:  [[IF_PRED_RES2:%.*]] = select [[PRED]], [[ARG_ELEM]], [[SEL_VAL]]
+    // CHECK:  [[IF_PRED_RES3:%.*]] = select [[PRED]], [[CTRUE]], [[SEL_INIT]]
 
     // INIT-THEN-BODY yield.
-    // CHECK:  scf.yield [[IF_PRED_RES]]#0, [[IF_PRED_RES]]#1,
-    // CHECK-SAME:        [[IF_PRED_RES]]#2, [[IF_PRED_RES]]#3
+    // CHECK:  scf.yield [[IF_PRED_RES0]], [[IF_PRED_RES1]],
+    // CHECK-SAME:        [[IF_PRED_RES2]], [[IF_PRED_RES3]]
 
     // INIT-ELSE-BODY, i.e. if INBOUNDS == TRUE and INIT == FALSE, returns ARG
     // ivs and element without computing Select function.