From 3fb1a8554de714cf7e01b8b57b4d073d170676da Mon Sep 17 00:00:00 2001
From: Richard Smith <richard-llvm@metafoo.co.uk>
Date: Tue, 30 Aug 2016 19:13:18 +0000
Subject: PR29166: when merging declarations with typedef names for linkage
 purposes, don't assume that the anonymous struct will be part of the most
 recent declaration of the typedef.

llvm-svn: 280136
---
 clang/lib/Serialization/ASTReaderDecl.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'clang/lib/Serialization/ASTReaderDecl.cpp')

diff --git a/clang/lib/Serialization/ASTReaderDecl.cpp b/clang/lib/Serialization/ASTReaderDecl.cpp
index e00c9561cd8..620e1fed300 100644
--- a/clang/lib/Serialization/ASTReaderDecl.cpp
+++ b/clang/lib/Serialization/ASTReaderDecl.cpp
@@ -2887,7 +2887,7 @@ static NamedDecl *getDeclForMerging(NamedDecl *Found,
     return nullptr;
 
   if (auto *TND = dyn_cast<TypedefNameDecl>(Found))
-    return TND->getAnonDeclWithTypedefName();
+    return TND->getAnonDeclWithTypedefName(/*AnyRedecl*/true);
 
   return nullptr;
 }
-- 
cgit v1.2.3