diff --git a/Source/cmWhileCommand.cxx b/Source/cmWhileCommand.cxx
index aabbe27158..7bb78bf8a9 100644
--- a/Source/cmWhileCommand.cxx
+++ b/Source/cmWhileCommand.cxx
@@ -55,13 +55,9 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf,
       commandContext.Line = execContext.Line;
       commandContext.Name = execContext.Name;
 
-      cmListFileContext conditionContext =
-          cmListFileContext::FromCommandContext(
-            commandContext,
-            this->GetStartingContext().FilePath);
-
       cmConditionEvaluator conditionEvaluator(
-            mf, conditionContext,
+            mf,
+            this->GetStartingContext(),
             mf.GetBacktrace(commandContext));
 
       bool isTrue = conditionEvaluator.IsTrue(