From fd6f08525f9292255249b2434af4c6b2bc02ee93 Mon Sep 17 00:00:00 2001 From: Eli Friedman Date: Fri, 27 Feb 2009 04:53:40 +0000 Subject: [PATCH] Change the way clang generates union types a bit so it plays well with the LLVM C backend. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@65615 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CodeGenTypes.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/CodeGen/CodeGenTypes.cpp b/lib/CodeGen/CodeGenTypes.cpp index 0912183053..77131332e6 100644 --- a/lib/CodeGen/CodeGenTypes.cpp +++ b/lib/CodeGen/CodeGenTypes.cpp @@ -555,6 +555,11 @@ void RecordOrganizer::layoutUnionFields(const ASTRecordLayout &RL) { // of the result doesn't matter because anyone allocating // structures should be aligning them appropriately anyway. // FIXME: We can be a bit more intuitive in a lot of cases. - STy = llvm::ArrayType::get(llvm::Type::Int8Ty, RL.getSize() / 8); + // FIXME: Make this a struct type to work around PR2399; the + // C backend doesn't like structs using array types. + std::vector LLVMFields; + LLVMFields.push_back(llvm::ArrayType::get(llvm::Type::Int8Ty, + RL.getSize() / 8)); + STy = llvm::StructType::get(LLVMFields, true); assert(CGT.getTargetData().getTypePaddedSizeInBits(STy) == RL.getSize()); } -- 2.50.1