mirrors/ldc
1
0
Fork 0
mirror of https://github.com/ldc-developers/ldc.git synced 2025-05-03 08:30:47 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

ImportC: Account for StringExp typed as static array with length > string length

Browse source 
Fixes dmd-testsuite's compilable/test23066.c.
This commit is contained in:
Martin Kinkelin 2022-10-07 00:04:16 +02:00
parent f31738b2d6
commit 14759a744e
5 changed files with 38 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

27
gen/llvmhelpers.cpp
View file

@ -1654,30 +1654,31 @@ llvm::Constant *DtoConstSymbolAddress(const Loc &loc, Declaration *decl) {
llvm_unreachable("Taking constant address not implemented.");
}
llvm::Constant *buildStringLiteralConstant(StringExp *se, bool zeroTerm) {
if (se->sz == 1) {
llvm::Constant *buildStringLiteralConstant(StringExp *se,
uint64_t bufferLength) {
const auto stringLength = se->numberOfCodeUnits();
assert(bufferLength >= stringLength);
if (se->sz == 1 && bufferLength <= stringLength + 1) {
const DString data = se->peekString();
const bool nullTerminate = (bufferLength == stringLength + 1);
return llvm::ConstantDataArray::getString(
gIR->context(), {data.ptr, data.length}, zeroTerm);
gIR->context(), {data.ptr, data.length}, nullTerminate);
}
Type *dtype = se->type->toBasetype();
Type *cty = dtype->nextOf()->toBasetype();
LLType *ct = DtoMemType(cty);
auto len = se->numberOfCodeUnits();
if (zeroTerm) {
len += 1;
}
LLArrayType *at = LLArrayType::get(ct, len);
LLArrayType *at = LLArrayType::get(ct, bufferLength);
std::vector<LLConstant *> vals;
vals.reserve(len);
for (size_t i = 0; i < se->numberOfCodeUnits(); ++i) {
vals.reserve(bufferLength);
for (uint64_t i = 0; i < stringLength; ++i) {
vals.push_back(LLConstantInt::get(ct, se->getCodeUnit(i), false));
}
if (zeroTerm) {
vals.push_back(LLConstantInt::get(ct, 0, false));
const auto nullChar = LLConstantInt::get(ct, 0, false);
for (uint64_t i = stringLength; i < bufferLength; ++i) {
vals.push_back(nullChar);
}
return LLConstantArray::get(at, vals);
}