Fixed misleading parameter name for PPCallbacks::FileSkipped

[voskresensky.vladimir]

Summary

The first parameter of PPCallbacks::FileSkipped callback is SkippedFile, not the ParentFile according to the call at Preprocessor::HandleIncludeDirective

[nikola]

Your original patch had changes in the clang-extra repo as well but those are missing in this review, was that intentional?

include/clang/Lex/PPCallbacks.h

58–59

You can probably remove ParentFile from this sentence.

[voskresensky.vladimir]

Sorry for the long delay! I've attached changes from 'clang-extra'

[nikola]

No worries. This looks good, just fix the ParentFile reference I mentioned.

[voskresensky.vladimir]

updated comments

[nikola]

LGTM, would you like me to commit this if you don't have access?

[voskresensky.vladimir]

Nikola, I don't have write access, so I'd appreciate your help with commit.

Btw, the updated diff was again only about clang repository, not extra. I used "update current" instead of "create new diff" was that correct? I do not see extra files in the list now, they are only in history of http://reviews.llvm.org/differential/diff/25416. What was the right way to use phabricator for such use case?

Thanks!
Vladimir.

[nikola]

I have no idea to be honest, the fact that we have only one svn repository but checkout different parts separately makes things confusing. And since I'm using git it's even more complicated ;)

Thanks for this, committed r237115 and r237116

include/clang/Lex/PPCallbacks.h

   /// \brief Callback invoked whenever a source file is skipped as the result
   /// of header guard optimization.
   ///
-  /// \param ParentFile The file that \#included the skipped file.
+  /// \param SkippedFile The file that is skipped instead of entering \#include
   ///
-  /// \param FilenameTok The token in ParentFile that indicates the
-  /// skipped file.
-  virtual void FileSkipped(const FileEntry &ParentFile,
+  /// \param FilenameTok The file name token in \#include "FileName" directive
+  /// or macro expanded file name token from \#include MACRO(PARAMS) directive.
+  /// Note that FilenameTok contains corresponding quotes/angles symbols.
+  virtual void FileSkipped(const FileEntry &SkippedFile,
                            const Token &FilenameTok,
                            SrcMgr::CharacteristicKind FileType) {
   }

     Second->FileChanged(Loc, Reason, FileType, PrevFID);
   }
 
-  void FileSkipped(const FileEntry &ParentFile,
+  void FileSkipped(const FileEntry &SkippedFile,
                    const Token &FilenameTok,
                    SrcMgr::CharacteristicKind FileType) override {
-    First->FileSkipped(ParentFile, FilenameTok, FileType);
-    Second->FileSkipped(ParentFile, FilenameTok, FileType);
+    First->FileSkipped(SkippedFile, FilenameTok, FileType);
+    Second->FileSkipped(SkippedFile, FilenameTok, FileType);
   }
 
   bool FileNotFound(StringRef FileName,

lib/Frontend/Rewrite/InclusionRewriter.cpp

   void FileChanged(SourceLocation Loc, FileChangeReason Reason,
                    SrcMgr::CharacteristicKind FileType,
                    FileID PrevFID) override;
-  void FileSkipped(const FileEntry &ParentFile, const Token &FilenameTok,
+  void FileSkipped(const FileEntry &SkippedFile, const Token &FilenameTok,
                    SrcMgr::CharacteristicKind FileType) override;
   void InclusionDirective(SourceLocation HashLoc, const Token &IncludeTok,
                           StringRef FileName, bool IsAngled,

 
 /// Called whenever an inclusion is skipped due to canonical header protection
 /// macros.
-void InclusionRewriter::FileSkipped(const FileEntry &/*ParentFile*/,
+void InclusionRewriter::FileSkipped(const FileEntry &/*SkippedFile*/,
                                     const Token &/*FilenameTok*/,
                                     SrcMgr::CharacteristicKind /*FileType*/) {
   assert(LastInsertedFileChange != FileChanges.end() && "A file, that wasn't "