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

Added -version=Tango in default llvmdc.conf

Browse source 
Fixed problem with array casts, all DWT modules needed for HelloWorld1 samples now compile. Still some linking issues.
This commit is contained in:
Tomas Lindquist Olsen 2008-10-06 12:46:57 +02:00
parent 62603c6aaf
commit f706098c56
3 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/llvmdc.conf
View file

@ -1,4 +1,4 @@
[Environment] [Environment]
DFLAGS=-I%@P%/../tango -I%@P%/../tango/lib/common -L-L%@P%/../lib DFLAGS=-I%@P%/../tango -I%@P%/../tango/lib/common -L-L%@P%/../lib -version=Tango

13
gen/arrays.cpp
View file

@ -998,10 +998,12 @@ DValue* DtoCastArray(Loc& loc, DValue* u, Type* to)
rval2 = DtoArrayCastLength(DtoArrayLen(usl), ety, ptrty->getContainedType(0)); rval2 = DtoArrayCastLength(DtoArrayLen(usl), ety, ptrty->getContainedType(0));
} }
else { else {
LLValue* uval = u->getRVal();
if (fromtype->ty == Tsarray) { if (fromtype->ty == Tsarray) {
LLValue* uval = u->getRVal();
if (Logger::enabled()) if (Logger::enabled())
Logger::cout() << "uvalTy = " << *uval->getType() << '\n'; Logger::cout() << "uvalTy = " << *uval->getType() << '\n';
assert(isaPointer(uval->getType())); assert(isaPointer(uval->getType()));
const LLArrayType* arrty = isaArray(uval->getType()->getContainedType(0)); const LLArrayType* arrty = isaArray(uval->getType()->getContainedType(0));
@ -1016,15 +1018,10 @@ DValue* DtoCastArray(Loc& loc, DValue* u, Type* to)
rval = DtoBitCast(uval, ptrty); rval = DtoBitCast(uval, ptrty);
} }
else { else {
LLValue* zero = llvm::ConstantInt::get(LLType::Int32Ty, 0, false); rval2 = DtoArrayLen(u);
LLValue* one = llvm::ConstantInt::get(LLType::Int32Ty, 1, false);
rval2 = DtoGEP(uval,zero,zero);
rval2 = DtoLoad(rval2);
rval2 = DtoArrayCastLength(rval2, ety, ptrty->getContainedType(0)); rval2 = DtoArrayCastLength(rval2, ety, ptrty->getContainedType(0));
rval = DtoGEP(uval,zero,one); rval = DtoArrayPtr(u);
rval = DtoLoad(rval);
//Logger::cout() << *e->mem->getType() << '|' << *ptrty << '\n';
rval = DtoBitCast(rval, ptrty); rval = DtoBitCast(rval, ptrty);
} }
} }

2
llvmdc-tango
View file

@ -32,7 +32,7 @@ testversion=LLVM64
[compile] [compile]
cmd=llvmdc -version=Tango -c $i cmd=llvmdc -c $i
flag=$i flag=$i
incdir=-I$i incdir=-I$i