mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-12-13 04:30:23 +00:00
Improve the bitcode reader's handling of constant strings to use
ConstantDataArray::getString direction, instead of "boxing" each byte into a ConstantInt and using ConstantArray::get. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@149805 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
521a255693
commit
2237f84735
@ -1092,33 +1092,17 @@ bool BitcodeReader::ParseConstants() {
|
||||
}
|
||||
break;
|
||||
}
|
||||
case bitc::CST_CODE_STRING: { // STRING: [values]
|
||||
if (Record.empty())
|
||||
return Error("Invalid CST_AGGREGATE record");
|
||||
|
||||
ArrayType *ATy = cast<ArrayType>(CurTy);
|
||||
Type *EltTy = ATy->getElementType();
|
||||
|
||||
unsigned Size = Record.size();
|
||||
SmallVector<Constant*, 16> Elts;
|
||||
for (unsigned i = 0; i != Size; ++i)
|
||||
Elts.push_back(ConstantInt::get(EltTy, Record[i]));
|
||||
V = ConstantArray::get(ATy, Elts);
|
||||
break;
|
||||
}
|
||||
case bitc::CST_CODE_STRING: // STRING: [values]
|
||||
case bitc::CST_CODE_CSTRING: { // CSTRING: [values]
|
||||
if (Record.empty())
|
||||
return Error("Invalid CST_AGGREGATE record");
|
||||
|
||||
ArrayType *ATy = cast<ArrayType>(CurTy);
|
||||
Type *EltTy = ATy->getElementType();
|
||||
return Error("Invalid CST_STRING record");
|
||||
|
||||
unsigned Size = Record.size();
|
||||
SmallVector<Constant*, 16> Elts;
|
||||
SmallString<16> Elts;
|
||||
for (unsigned i = 0; i != Size; ++i)
|
||||
Elts.push_back(ConstantInt::get(EltTy, Record[i]));
|
||||
Elts.push_back(Constant::getNullValue(EltTy));
|
||||
V = ConstantArray::get(ATy, Elts);
|
||||
Elts.push_back(Record[i]);
|
||||
V = ConstantDataArray::getString(Context, Elts,
|
||||
BitCode == bitc::CST_CODE_CSTRING);
|
||||
break;
|
||||
}
|
||||
case bitc::CST_CODE_DATA: {// DATA: [n x value]
|
||||
|
Loading…
Reference in New Issue
Block a user