diff options
author | Faisal Vali <faisalv@yahoo.com> | 2017-07-17 02:03:21 +0000 |
---|---|---|
committer | Faisal Vali <faisalv@yahoo.com> | 2017-07-17 02:03:21 +0000 |
commit | 0e54e5679e92951d73f9f6492c0734d8746d76a9 (patch) | |
tree | f716af622bd481355d5c3f2de2447dd1240008cc /clang/lib/Serialization/ASTReader.cpp | |
parent | 11746b05e576ca2a1f21b61721d0a13975ace751 (diff) | |
download | bcm5719-llvm-0e54e5679e92951d73f9f6492c0734d8746d76a9.tar.gz bcm5719-llvm-0e54e5679e92951d73f9f6492c0734d8746d76a9.zip |
Revert changes from my previous refactoring - will need to fix dependencies in clang's extra tooling (such as clang-tidy etc.).
Sorry about that.
llvm-svn: 308158
Diffstat (limited to 'clang/lib/Serialization/ASTReader.cpp')
-rw-r--r-- | clang/lib/Serialization/ASTReader.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp index 50be74f6bf6..7da171b6555 100644 --- a/clang/lib/Serialization/ASTReader.cpp +++ b/clang/lib/Serialization/ASTReader.cpp @@ -1520,7 +1520,7 @@ MacroInfo *ASTReader::ReadMacroRecord(ModuleFile &F, uint64_t Offset) { Stream.JumpToBit(Offset); RecordData Record; - SmallVector<IdentifierInfo*, 16> MacroParams; + SmallVector<IdentifierInfo*, 16> MacroArgs; MacroInfo *Macro = nullptr; while (true) { @@ -1571,17 +1571,17 @@ MacroInfo *ASTReader::ReadMacroRecord(ModuleFile &F, uint64_t Offset) { bool isC99VarArgs = Record[NextIndex++]; bool isGNUVarArgs = Record[NextIndex++]; bool hasCommaPasting = Record[NextIndex++]; - MacroParams.clear(); + MacroArgs.clear(); unsigned NumArgs = Record[NextIndex++]; for (unsigned i = 0; i != NumArgs; ++i) - MacroParams.push_back(getLocalIdentifier(F, Record[NextIndex++])); + MacroArgs.push_back(getLocalIdentifier(F, Record[NextIndex++])); // Install function-like macro info. MI->setIsFunctionLike(); if (isC99VarArgs) MI->setIsC99Varargs(); if (isGNUVarArgs) MI->setIsGNUVarargs(); if (hasCommaPasting) MI->setHasCommaPasting(); - MI->setParameterList(MacroParams, PP.getPreprocessorAllocator()); + MI->setArgumentList(MacroArgs, PP.getPreprocessorAllocator()); } // Remember that we saw this macro last so that we add the tokens that |