diff options
| author | Chris Lattner <sabre@nondot.org> | 2010-03-16 21:25:55 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2010-03-16 21:25:55 +0000 |
| commit | 535969b90b24725bd3145ffd638077a5dd5e50fd (patch) | |
| tree | d694e4a5c050ee2ef44074d5b102c8e4305f6754 /lib/Bitcode/Writer/BitcodeWriter.cpp | |
| parent | bc6543220fcf2d3e29740db297b4ccf736a21fa7 (diff) | |
| download | external_llvm-535969b90b24725bd3145ffd638077a5dd5e50fd.zip external_llvm-535969b90b24725bd3145ffd638077a5dd5e50fd.tar.gz external_llvm-535969b90b24725bd3145ffd638077a5dd5e50fd.tar.bz2 | |
reapply r98656 unmodified, which exposed the asmprinter not
handling constant unions.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@98680 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Bitcode/Writer/BitcodeWriter.cpp')
| -rw-r--r-- | lib/Bitcode/Writer/BitcodeWriter.cpp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/lib/Bitcode/Writer/BitcodeWriter.cpp b/lib/Bitcode/Writer/BitcodeWriter.cpp index 82e73b5..3ab2726 100644 --- a/lib/Bitcode/Writer/BitcodeWriter.cpp +++ b/lib/Bitcode/Writer/BitcodeWriter.cpp @@ -808,11 +808,25 @@ static void WriteConstants(unsigned FirstVal, unsigned LastVal, else if (isCStr7) AbbrevToUse = CString7Abbrev; } else if (isa<ConstantArray>(C) || isa<ConstantStruct>(V) || - isa<ConstantUnion>(C) || isa<ConstantVector>(V)) { + isa<ConstantVector>(V)) { Code = bitc::CST_CODE_AGGREGATE; for (unsigned i = 0, e = C->getNumOperands(); i != e; ++i) Record.push_back(VE.getValueID(C->getOperand(i))); AbbrevToUse = AggregateAbbrev; + } else if (isa<ConstantUnion>(C)) { + Code = bitc::CST_CODE_AGGREGATE; + + // Unions only have one entry but we must send type along with it. + const Type *EntryKind = C->getOperand(0)->getType(); + + const UnionType *UnTy = cast<UnionType>(C->getType()); + int UnionIndex = UnTy->getElementTypeIndex(EntryKind); + assert(UnionIndex != -1 && "Constant union contains invalid entry"); + + Record.push_back(UnionIndex); + Record.push_back(VE.getValueID(C->getOperand(0))); + + AbbrevToUse = AggregateAbbrev; } else if (const ConstantExpr *CE = dyn_cast<ConstantExpr>(C)) { switch (CE->getOpcode()) { default: |