Mercurial > projects > ldc
changeset 1292:ad41053c336e
Make static int[] a = [1, 2]; a[0] = 4; not segfault
by making the array data ptr a non-const global variable.
| author | Christian Kamm <kamm incasoftware de> |
|---|---|
| date | Sun, 03 May 2009 11:16:54 +0200 |
| parents | 875afb7a93b6 |
| children | 00b408a5b7fa |
| files | gen/arrays.cpp gen/toir.cpp tests/mini/mutablearrayinit.d |
| diffstat | 3 files changed, 15 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/gen/arrays.cpp Sat May 02 20:42:58 2009 +0200 +++ b/gen/arrays.cpp Sun May 03 11:16:54 2009 +0200 @@ -317,7 +317,9 @@ return constarr; // for dynamic array we need to make a global with the data, so we have a pointer for the dynamic array - LLGlobalVariable* gvar = new LLGlobalVariable(constarr->getType(), true, LLGlobalValue::InternalLinkage, constarr, ".constarray", gIR->module); + // Important: don't make the gvar constant, since this const initializer might + // be used as an initializer for a static T[] - where modifying contents is allowed. + LLGlobalVariable* gvar = new LLGlobalVariable(constarr->getType(), false, LLGlobalValue::InternalLinkage, constarr, ".constarray", gIR->module); LLConstant* idxs[2] = { DtoConstUint(0), DtoConstUint(0) }; LLConstant* gep = llvm::ConstantExpr::getGetElementPtr(gvar,idxs,2);
--- a/gen/toir.cpp Sat May 02 20:42:58 2009 +0200 +++ b/gen/toir.cpp Sun May 03 11:16:54 2009 +0200 @@ -2405,7 +2405,9 @@ return initval; // for dynamic arrays we need to put the initializer in a global, and build a constant dynamic array reference with the .ptr field pointing into this global - LLConstant* globalstore = new LLGlobalVariable(arrtype, true, LLGlobalValue::InternalLinkage, initval, ".dynarrayStorage", p->module); + // Important: don't make the global constant, since this const initializer might + // be used as an initializer for a static T[] - where modifying contents is allowed. + LLConstant* globalstore = new LLGlobalVariable(arrtype, false, LLGlobalValue::InternalLinkage, initval, ".dynarrayStorage", p->module); LLConstant* idxs[2] = { DtoConstUint(0), DtoConstUint(0) }; LLConstant* globalstorePtr = llvm::ConstantExpr::getGetElementPtr(globalstore, idxs, 2);