diff options
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 82e73b5cff25..3ab272666749 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: | 
