rsmith accepted this revision. rsmith added inline comments. This revision is now accepted and ready to land.
================ Comment at: clang/lib/Serialization/ASTReaderDecl.cpp:1795 CXXRecordDecl *Canon = D->getCanonicalDecl(); - if (Canon->DefinitionData) { + if (Canon->DefinitionData && Canon->DefinitionData != DD) { MergeDefinitionData(Canon, std::move(*DD)); ---------------- It's a little odd that we'll temporarily have two different declarations that think they're the definition in this case, but I don't actually know of anything that'll go wrong as a result. (This seems easy to avoid, though, by checking whether there already is a definition earlier.) https://reviews.llvm.org/D43494 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits