diff options
| author | David Chisnall <csdavec@swan.ac.uk> | 2009-11-16 19:05:54 +0000 |
|---|---|---|
| committer | David Chisnall <csdavec@swan.ac.uk> | 2009-11-16 19:05:54 +0000 |
| commit | b3b44ce433a459ad49531c5528259580ee4cc6ee (patch) | |
| tree | c265e5c0974886af4b8632c231e4d2cd665bf464 | |
| parent | 9785e5914f565898c635a04f5f0c8ada314ca607 (diff) | |
| download | bcm5719-llvm-b3b44ce433a459ad49531c5528259580ee4cc6ee.tar.gz bcm5719-llvm-b3b44ce433a459ad49531c5528259580ee4cc6ee.zip | |
Fixed two minor differences between clang and GCC-generated runtime structures for the GNU runtime.
llvm-svn: 88937
| -rw-r--r-- | clang/lib/CodeGen/CGObjCGNU.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CGObjCGNU.cpp b/clang/lib/CodeGen/CGObjCGNU.cpp index f348bfffcb8..a71cd839306 100644 --- a/clang/lib/CodeGen/CGObjCGNU.cpp +++ b/clang/lib/CodeGen/CGObjCGNU.cpp @@ -608,6 +608,8 @@ llvm::Constant *CGObjCGNU::GenerateIvarList( const llvm::SmallVectorImpl<llvm::Constant *> &IvarNames, const llvm::SmallVectorImpl<llvm::Constant *> &IvarTypes, const llvm::SmallVectorImpl<llvm::Constant *> &IvarOffsets) { + if (IvarNames.size() == 0) + return NULLPtr; // Get the method structure type. llvm::StructType *ObjCIvarTy = llvm::StructType::get(VMContext, PtrToInt8Ty, @@ -1301,7 +1303,7 @@ void CGObjCGNU::GenerateClass(const ObjCImplementationDecl *OID) { } //Generate metaclass for class methods llvm::Constant *MetaClassStruct = GenerateClassStructure(NULLPtr, - NULLPtr, 0x12L, /*name*/"", 0, Zeros[0], GenerateIvarList( + NULLPtr, 0x12L, ClassName.c_str(), 0, Zeros[0], GenerateIvarList( empty, empty, empty), ClassMethodList, NULLPtr, NULLPtr, NULLPtr); // Generate the class structure |
