From da2da64d0ea074d089e23cc1605f91b55b63a04c Mon Sep 17 00:00:00 2001 From: Paul Date: Fri, 27 Mar 2020 14:00:26 -0500 Subject: [PATCH] Move the condition into the if statement so that short-circuiting can skip it --- clang/lib/Basic/SourceManager.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/clang/lib/Basic/SourceManager.cpp b/clang/lib/Basic/SourceManager.cpp index e24cdc1ce7fc8..b9738785e7cdb 100644 --- a/clang/lib/Basic/SourceManager.cpp +++ b/clang/lib/Basic/SourceManager.cpp @@ -751,8 +751,7 @@ FileID SourceManager::getFileIDLocal(unsigned SLocOffset) const { // FIXME: Handle file start location // It is CXXAMP Specific. However it shall be ok in general - bool patch = (LocalSLocEntryTable[LastFileIDLookup.ID].getOffset() <= SLocOffset); - if (LastFileIDLookup.ID < 0 || patch || + if (LastFileIDLookup.ID < 0 || (LocalSLocEntryTable[LastFileIDLookup.ID].getOffset() <= SLocOffset) || LocalSLocEntryTable[LastFileIDLookup.ID].getOffset() < SLocOffset) { // Neither loc prunes our search. I = LocalSLocEntryTable.end();