From fe09eab8095da4d3a3c68441e1566671dc9568d3 Mon Sep 17 00:00:00 2001 From: Devang Patel Date: Mon, 13 Jul 2009 17:03:14 +0000 Subject: [PATCH] Update debug info type cache after fwd decl is replaced by real decl. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@75473 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CGDebugInfo.cpp | 8 ++++++-- test/CodeGenObjC/PR4541.m | 19 +++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 test/CodeGenObjC/PR4541.m diff --git a/lib/CodeGen/CGDebugInfo.cpp b/lib/CodeGen/CGDebugInfo.cpp index 9bab926977..3d7417df30 100644 --- a/lib/CodeGen/CGDebugInfo.cpp +++ b/lib/CodeGen/CGDebugInfo.cpp @@ -501,7 +501,9 @@ llvm::DIType CGDebugInfo::CreateType(const RecordType *Ty, // old decl with the new one. This will recursively update the debug info. FwdDecl.getGV()->replaceAllUsesWith(RealDecl.getGV()); FwdDecl.getGV()->eraseFromParent(); - + + // Update TypeCache. + TypeCache[QualType(Ty, 0).getAsOpaquePtr()] = RealDecl; return RealDecl; } @@ -626,7 +628,9 @@ llvm::DIType CGDebugInfo::CreateType(const ObjCInterfaceType *Ty, // old decl with the new one. This will recursively update the debug info. FwdDecl.getGV()->replaceAllUsesWith(RealDecl.getGV()); FwdDecl.getGV()->eraseFromParent(); - + + // Update TypeCache. + TypeCache[QualType(Ty, 0).getAsOpaquePtr()] = RealDecl; return RealDecl; } diff --git a/test/CodeGenObjC/PR4541.m b/test/CodeGenObjC/PR4541.m new file mode 100644 index 0000000000..9a651162c1 --- /dev/null +++ b/test/CodeGenObjC/PR4541.m @@ -0,0 +1,19 @@ +// RUN: clang-cc -o %t -w -g %s + + +@class NSString; +@interface NSAttributedString +- (NSString *)string; +@end +@interface NSMutableAttributedString : NSAttributedString +@end +@class NSImage; +@implementation CYObjectsController ++ (void)initialize { +} ++ (NSAttributedString *)attributedStringWithString:(id)string image:(NSImage *)image { + NSMutableAttributedString *attrStr; +} +@end + + -- 2.50.1