mstorsjo created this revision. mstorsjo added reviewers: aaron.ballman, rnk, shafik. Herald added a project: All. mstorsjo requested review of this revision. Herald added a project: clang.
The two first parameters of checkPreprocessorOptions are "PPOpts, ExistingPPOpts". All other callers of the function pass them consistently. This avoids confusion when working on the code. Repository: rG LLVM Github Monorepo https://reviews.llvm.org/D129277 Files: clang/lib/Serialization/ASTReader.cpp Index: clang/lib/Serialization/ASTReader.cpp =================================================================== --- clang/lib/Serialization/ASTReader.cpp +++ clang/lib/Serialization/ASTReader.cpp @@ -5171,7 +5171,7 @@ bool ReadPreprocessorOptions(const PreprocessorOptions &PPOpts, bool Complain, std::string &SuggestedPredefines) override { - return checkPreprocessorOptions(ExistingPPOpts, PPOpts, nullptr, FileMgr, + return checkPreprocessorOptions(PPOpts, ExistingPPOpts, nullptr, FileMgr, SuggestedPredefines, ExistingLangOpts); } };
Index: clang/lib/Serialization/ASTReader.cpp =================================================================== --- clang/lib/Serialization/ASTReader.cpp +++ clang/lib/Serialization/ASTReader.cpp @@ -5171,7 +5171,7 @@ bool ReadPreprocessorOptions(const PreprocessorOptions &PPOpts, bool Complain, std::string &SuggestedPredefines) override { - return checkPreprocessorOptions(ExistingPPOpts, PPOpts, nullptr, FileMgr, + return checkPreprocessorOptions(PPOpts, ExistingPPOpts, nullptr, FileMgr, SuggestedPredefines, ExistingLangOpts); } };
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits