D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-01-14 20:03:14 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into merge-2.062

Browse Source 
Conflicts:
	gen/llvmhelpers.cpp
This commit is contained in:
kai
2013-03-08 06:07:34 +01:00
parent 9ea68545b7 a303622074
commit 71171dbc24
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gen/llvmhelpers.cpp
View File

@@ -808,7 +808,20 @@ DValue* DtoCast(Loc& loc, DValue* val, Type* to)
Type* totype = to->toBasetype();
if (fromtype->ty == Taarray)
{
// DMD allows casting AAs to void*, even if they are internally
// implemented as structs.
if (totype->ty == Tpointer)
{
IF_LOG Logger::println("Casting AA to pointer.");
LLValue *rval = DtoBitCast(val->getRVal(), DtoType(to));
return new DImValue(to, rval);
}
// Else try dealing with the rewritten (struct) type.
fromtype = static_cast<TypeAArray*>(fromtype)->getImpl()->type;
}
if (totype->ty == Taarray)
totype = static_cast<TypeAArray*>(totype)->getImpl()->type;
@@ -821,8 +834,7 @@ DValue* DtoCast(Loc& loc, DValue* val, Type* to)
if (fromtype->ty == Tvector) {
return DtoCastVector(loc, val, to);
}
else
if (fromtype->isintegral()) {
else if (fromtype->isintegral()) {
return DtoCastInt(loc, val, to);
}
else if (fromtype->iscomplex()) {