diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Serialization/ASTReaderDecl.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/Serialization/ASTReaderDecl.cpp b/lib/Serialization/ASTReaderDecl.cpp index abab88a9c6..82f6fae4a0 100644 --- a/lib/Serialization/ASTReaderDecl.cpp +++ b/lib/Serialization/ASTReaderDecl.cpp @@ -1512,6 +1512,10 @@ ASTDeclReader::VisitRedeclarable(Redeclarable<T> *D) { template<typename T> void ASTDeclReader::mergeRedeclarable(Redeclarable<T> *D, RedeclarableResult &Redecl) { + // If modules are not available, there is no reason to perform this merge. + if (!Reader.getContext().getLangOptions().Modules) + return; + if (FindExistingResult ExistingRes = findExisting(static_cast<T*>(D))) { if (T *Existing = ExistingRes) { T *ExistingCanon = Existing->getCanonicalDecl(); |