Index: lib/Core/DefinedAtom.cpp
===================================================================
--- lib/Core/DefinedAtom.cpp
+++ lib/Core/DefinedAtom.cpp
@@ -83,14 +83,12 @@

 bool DefinedAtom::compareByPosition(const DefinedAtom *lhs,
                                     const DefinedAtom *rhs) {
-  const File *lhsFile;
-  const File *rhsFile;

   if (lhs == rhs)
     return false;

-  lhsFile = &lhs->file();
-  rhsFile = &rhs->file();
+  const File *lhsFile = &lhs->file();
+  const File *rhsFile = &rhs->file();

   if (lhsFile->ordinal() != rhsFile->ordinal())
     return lhsFile->ordinal() < rhsFile->ordinal();