diff options
| author | Julie Hockett <juliehockett@google.com> | 2018-05-09 22:25:47 +0000 |
|---|---|---|
| committer | Julie Hockett <juliehockett@google.com> | 2018-05-09 22:25:47 +0000 |
| commit | e5a13a5389926ed4981c01686794e07738b997e0 (patch) | |
| tree | 3794632929e746dbfbc3d726eedf6273f0d4d265 /include/clang/Lex | |
| parent | 9fac2a0400f16e7731fd9756897bbb3818679695 (diff) | |
Revert "[clang] Adding CharacteristicKind to PPCallbacks::InclusionDirective"
This reverts commit r331904 because of a memory leak.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@331932 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/clang/Lex')
| -rw-r--r-- | include/clang/Lex/PPCallbacks.h | 14 | ||||
| -rw-r--r-- | include/clang/Lex/PreprocessingRecord.h | 4 |
2 files changed, 6 insertions, 12 deletions
diff --git a/include/clang/Lex/PPCallbacks.h b/include/clang/Lex/PPCallbacks.h index eb85bda840..1814821cdc 100644 --- a/include/clang/Lex/PPCallbacks.h +++ b/include/clang/Lex/PPCallbacks.h @@ -117,10 +117,6 @@ public: /// \param Imported The module, whenever an inclusion directive was /// automatically turned into a module import or null otherwise. /// - /// \param FileType The characteristic kind, indicates whether a file or - /// directory holds normal user code, system code, or system code which is - /// implicitly 'extern "C"' in C++ mode. - /// virtual void InclusionDirective(SourceLocation HashLoc, const Token &IncludeTok, StringRef FileName, @@ -129,8 +125,7 @@ public: const FileEntry *File, StringRef SearchPath, StringRef RelativePath, - const Module *Imported, - SrcMgr::CharacteristicKind FileType) { + const Module *Imported) { } /// Callback invoked whenever there was an explicit module-import @@ -372,14 +367,13 @@ public: StringRef FileName, bool IsAngled, CharSourceRange FilenameRange, const FileEntry *File, StringRef SearchPath, StringRef RelativePath, - const Module *Imported, - SrcMgr::CharacteristicKind FileType) override { + const Module *Imported) override { First->InclusionDirective(HashLoc, IncludeTok, FileName, IsAngled, FilenameRange, File, SearchPath, RelativePath, - Imported, FileType); + Imported); Second->InclusionDirective(HashLoc, IncludeTok, FileName, IsAngled, FilenameRange, File, SearchPath, RelativePath, - Imported, FileType); + Imported); } void moduleImport(SourceLocation ImportLoc, ModuleIdPath Path, diff --git a/include/clang/Lex/PreprocessingRecord.h b/include/clang/Lex/PreprocessingRecord.h index 54e28a52f5..d9233c5d8d 100644 --- a/include/clang/Lex/PreprocessingRecord.h +++ b/include/clang/Lex/PreprocessingRecord.h @@ -532,8 +532,8 @@ class Token; StringRef FileName, bool IsAngled, CharSourceRange FilenameRange, const FileEntry *File, StringRef SearchPath, - StringRef RelativePath, const Module *Imported, - SrcMgr::CharacteristicKind FileType) override; + StringRef RelativePath, + const Module *Imported) override; void Ifdef(SourceLocation Loc, const Token &MacroNameTok, const MacroDefinition &MD) override; void Ifndef(SourceLocation Loc, const Token &MacroNameTok, |