diff --git a/alloy.py b/alloy.py index b30b98ba..68013865 100755 --- a/alloy.py +++ b/alloy.py @@ -105,6 +105,8 @@ def build_LLVM(version_LLVM, revision, folder, tarball, debug, selfbuild, extra, revision = "-" + revision if folder == "": folder = FOLDER_NAME + if debug == True: + folder = folder + "dbg" LLVM_SRC="llvm-" + folder LLVM_BUILD="build-" + folder LLVM_BIN="bin-" + folder diff --git a/expr.cpp b/expr.cpp index 1b739a9a..b5c876fd 100644 --- a/expr.cpp +++ b/expr.cpp @@ -339,7 +339,14 @@ lDoTypeConv(const Type *fromType, const Type *toType, Expr **expr, return false; } else if (PointerType::IsVoidPointer(toPointerType)) { + if (fromPointerType->GetBaseType()->IsConstType()) { + if (!failureOk) + Error(pos, "Can't convert pointer to const \"%s\" to void pointer.", + fromPointerType->GetString().c_str()); + return false; + } // any pointer type can be converted to a void * + // ...almost. #731 goto typecast_ok; } else if (PointerType::IsVoidPointer(fromPointerType) && diff --git a/stmt.cpp b/stmt.cpp index 4ec63d35..52d25fe9 100644 --- a/stmt.cpp +++ b/stmt.cpp @@ -3003,6 +3003,14 @@ lProcessPrintArg(Expr *expr, FunctionEmitContext *ctx, std::string &argTypes) { return NULL; } else { + if (Type::Equal(baseType, AtomicType::UniformBool)) { + // Blast bools to ints, but do it here to preserve encoding for + // printing 'true' or 'false' + expr = new TypeCastExpr(type->IsUniformType() ? AtomicType::UniformInt32 : + AtomicType::VaryingInt32, + expr, expr->pos); + type = expr->GetType(); + } argTypes.push_back(t); llvm::Type *llvmExprType = type->LLVMType(g->ctx);