address comments

Author: abhina-sree

clang/include/clang/Basic/FileEntry.h

@@ -71,11 +71,9 @@ class FileEntryRef {
     return *getBaseMapEntry().second->V.get<FileEntry *>();
   }
 
-  // This is a non const version of getFileEntry() which is used if the buffer
-  // size needs to be increased due to potential z/OS EBCDIC -> UTF-8 conversion
-  FileEntry &getFileEntryToUpdate() {
-    return *getBaseMapEntry().second->V.get<FileEntry *>();
-  }
+  // This function is used if the buffer size needs to be increased
+  // due to potential z/OS EBCDIC -> UTF-8 conversion
+  inline void updateFileEntryBufferSize(unsigned BufferSize);
 
   DirectoryEntryRef getDir() const { return ME->second->Dir; }
 
@@ -362,6 +360,10 @@ bool FileEntryRef::isNamedPipe() const { return getFileEntry().isNamedPipe(); }
 
 void FileEntryRef::closeFile() const { getFileEntry().closeFile(); }
 
+void FileEntryRef::updateFileEntryBufferSize(unsigned BufferSize) {
+  getBaseMapEntry().second->V.get<FileEntry *>()->setSize(BufferSize);
+}
+
 } // end namespace clang
 
 #endif // LLVM_CLANG_BASIC_FILEENTRY_H

clang/lib/Basic/SourceManager.cpp

@@ -627,7 +627,7 @@ FileID SourceManager::createFileIDImpl(ContentCache &File, StringRef Filename,
       unsigned BufSize = Buffer->getBufferSize();
       if (BufSize > FileSize) {
         if (File.ContentsEntry.has_value())
-          File.ContentsEntry->getFileEntryToUpdate().setSize(BufSize);
+          File.ContentsEntry->updateFileEntryBufferSize(BufSize);
         FileSize = BufSize;
       }
     }