diff --git a/compiler/optimizing/loop_optimization_test.cc b/compiler/optimizing/loop_optimization_test.cc
index 3697651..7f694fb 100644
--- a/compiler/optimizing/loop_optimization_test.cc
+++ b/compiler/optimizing/loop_optimization_test.cc
@@ -324,8 +324,7 @@
   EXPECT_EQ(preheader1->GetSingleSuccessor(), new_preheader);
 
   EXPECT_EQ(new_preheader->GetPhis().CountSize(), 1u);
-  // TODO: Remove "OrNull".
-  HPhi* new_preheader_phi = new_preheader->GetFirstPhi()->AsPhiOrNull();
+  HPhi* new_preheader_phi = new_preheader->GetFirstPhi()->AsPhi();
   EXPECT_EQ(new_preheader_phi->InputCount(), 2u);
   EXPECT_EQ(new_preheader_phi->InputAt(0), preheader0_add);
   EXPECT_EQ(new_preheader_phi->InputAt(1), preheader1_add);