diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2016-04-07 20:47:37 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2016-04-07 20:47:37 +0000 |
| commit | a1ddf5e74433b9fbe99d9d26a3297c2f90b1da5e (patch) | |
| tree | c74ab375527246abe9d2171f0bdb1a3c8019fe63 /clang/lib | |
| parent | 8c76487ee5526ae81dc442b41abb2a785453c31d (diff) | |
| download | bcm5719-llvm-a1ddf5e74433b9fbe99d9d26a3297c2f90b1da5e.tar.gz bcm5719-llvm-a1ddf5e74433b9fbe99d9d26a3297c2f90b1da5e.zip | |
[modules] Allow differences in flags that only affect preprocessor predefines
(and __has_feature checks) between explicitly-specified module files and the
current compilation.
llvm-svn: 265718
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/Serialization/ASTReader.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp index c0517e7db81..0ca6c0fea7b 100644 --- a/clang/lib/Serialization/ASTReader.cpp +++ b/clang/lib/Serialization/ASTReader.cpp @@ -217,8 +217,13 @@ static bool checkLanguageOptions(const LangOptions &LangOpts, if (!AllowCompatibleDifferences) \ ENUM_LANGOPT(Name, Bits, Default, Description) +#define COMPATIBLE_VALUE_LANGOPT(Name, Bits, Default, Description) \ + if (!AllowCompatibleDifferences) \ + VALUE_LANGOPT(Name, Bits, Default, Description) + #define BENIGN_LANGOPT(Name, Bits, Default, Description) #define BENIGN_ENUM_LANGOPT(Name, Type, Bits, Default, Description) +#define BENIGN_VALUE_LANGOPT(Name, Type, Bits, Default, Description) #include "clang/Basic/LangOptions.def" if (ExistingLangOpts.ModuleFeatures != LangOpts.ModuleFeatures) { |
