diff options
| -rw-r--r-- | clang/lib/CodeGen/CGObjCGNU.cpp | 2 | ||||
| -rw-r--r-- | clang/test/CodeGenObjC/ivar-type-encoding.m | 35 |
2 files changed, 36 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CGObjCGNU.cpp b/clang/lib/CodeGen/CGObjCGNU.cpp index ce39bd1c947..9f6ccb4b5d2 100644 --- a/clang/lib/CodeGen/CGObjCGNU.cpp +++ b/clang/lib/CodeGen/CGObjCGNU.cpp @@ -2207,7 +2207,7 @@ void CGObjCGNU::GenerateClass(const ObjCImplementationDecl *OID) { IvarNames.push_back(MakeConstantString(IVD->getNameAsString())); // Get the type encoding for this ivar std::string TypeStr; - Context.getObjCEncodingForType(IVD->getType(), TypeStr); + Context.getObjCEncodingForType(IVD->getType(), TypeStr, IVD); IvarTypes.push_back(MakeConstantString(TypeStr)); // Get the offset uint64_t BaseOffset = ComputeIvarBaseOffset(CGM, OID, IVD); diff --git a/clang/test/CodeGenObjC/ivar-type-encoding.m b/clang/test/CodeGenObjC/ivar-type-encoding.m new file mode 100644 index 00000000000..ffa5e0d7af0 --- /dev/null +++ b/clang/test/CodeGenObjC/ivar-type-encoding.m @@ -0,0 +1,35 @@ +// RUN: %clang_cc1 -S -emit-llvm -fobjc-runtime=gcc -o - %s | FileCheck %s + +@protocol NSCopying +@end + +@interface NSObject { + struct objc_object *isa; +} ++ (id) new; +- (id) init; +@end + +@interface NSString : NSObject <NSCopying> ++ (NSString *)foo; +@end + +@interface TestClass : NSObject { +@public + NSString *_stringIvar; + int _intIvar; +} +@end +@implementation TestClass + +@end + +int main() { + TestClass *c = [TestClass new]; + return 0; +} + +// CHECK: @0 = private unnamed_addr constant [12 x i8] c"_stringIvar\00" +// CHECK: @1 = private unnamed_addr constant [12 x i8] c"@\22NSString\22\00" +// CHECK: @2 = private unnamed_addr constant [9 x i8] c"_intIvar\00" +// CHECK: @3 = private unnamed_addr constant [2 x i8] c"i\00" |
