1 files changed, 3 insertions, 3 deletions
diff --git a/compilerplugins/clang/elidestringvar.cxx b/compilerplugins/clang/elidestringvar.cxx
index 412fa8cb09db..c14eaf027b0f 100644
--- a/compilerplugins/clang/elidestringvar.cxx
+++ b/compilerplugins/clang/elidestringvar.cxx
@@ -62,8 +62,8 @@ public:
             {
                 continue;
             }
-            if (containsPreprocessingConditionalInclusion(SourceRange(
-                    compat::getBeginLoc(var.first), compat::getEndLoc(*var.second.singleUse))))
+            if (containsPreprocessingConditionalInclusion(
+                    SourceRange(var.first->getBeginLoc(), (*var.second.singleUse)->getEndLoc())))
             {
                 // This is not perfect, as additional uses can be hidden in conditional blocks that
                 // only start after the (would-be) single use (as was the case in
@@ -446,7 +446,7 @@ private:
         {
         }
         Stmt const* innermostLoop;
-        llvm::Optional<Expr const*> singleUse;
+        compat::optional<Expr const*> singleUse;
     };
 
     std::stack<Stmt const*> innermostLoop_;