commit b3b44ce433a459ad49531c5528259580ee4cc6ee
author David Chisnall <csdavec@swan.ac.uk> Mon Nov 16 19:05:54 2009 +0000
committer David Chisnall <csdavec@swan.ac.uk> Mon Nov 16 19:05:54 2009 +0000
tree c265e5c0974886af4b8632c231e4d2cd665bf464
parent 9785e5914f565898c635a04f5f0c8ada314ca607

Fixed two minor differences between clang and GCC-generated runtime structures for the GNU runtime.

llvm-svn: 88937

clang/lib/CodeGen/CGObjCGNU.cpp

diff --git a/clang/lib/CodeGen/CGObjCGNU.cpp b/clang/lib/CodeGen/CGObjCGNU.cpp
index f348bff..a71cd83 100644
--- a/clang/lib/CodeGen/CGObjCGNU.cpp
+++ b/clang/lib/CodeGen/CGObjCGNU.cpp
@@ -608,6 +608,8 @@
     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 @@
   }
   //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