aaron/ispc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge with master

Browse Source
This commit is contained in:
Evghenii
2014-02-01 11:53:57 +01:00
parent 0c47a902f5 93cf02842c
commit 6bf2ad27d1
5 changed files with 250 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
expr.cpp
View File

@@ -6962,9 +6962,9 @@ TypeCastExpr::GetValue(FunctionEmitContext *ctx) const {
return ctx->BitCastInst(v, ptype); //, "array_cast_0size");
}
AssertPos(pos, Type::Equal(toTarget, fromTarget) ||
Type::Equal(toTarget, fromTarget->GetAsConstType()));
return expr->GetValue(ctx);
// Just bitcast it. See Issue #721
llvm::Value *value = expr->GetValue(ctx);
return ctx->BitCastInst(value, toType->LLVMType(g->ctx), "refcast");
}
const StructType *toStruct = CastType<StructType>(toType);
@@ -7170,6 +7170,14 @@ TypeCastExpr::TypeCheck() {
// allow explicit typecasts between any two different pointer types
return this;
const ReferenceType *fromRef = CastType<ReferenceType>(fromType);
const ReferenceType *toRef = CastType<ReferenceType>(toType);
if (fromRef != NULL && toRef != NULL) {
// allow explicit typecasts between any two different reference types
// Issues #721
return this;
}
const AtomicType *fromAtomic = CastType<AtomicType>(fromType);
const AtomicType *toAtomic = CastType<AtomicType>(toType);
const EnumType *fromEnum = CastType<EnumType>(fromType);