diff options
| -rw-r--r-- | lib/CodeGen/CodeGenTypes.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
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<const llvm::Type*> 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()); } |