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

Build fix for LLVM r75546 and r75559

Browse Source
This commit is contained in:
Benjamin Kramer
2009-07-14 02:19:05 +02:00
parent 0075194b90
commit 076ef17159
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
gen/passes/GarbageCollect2Stack.cpp
View File

@@ -85,6 +85,7 @@ static void EmitMemZero(IRBuilder<>& B, Value* Dst, Value* Len,
namespace {
class FunctionInfo {
protected:
LLVMContext* Context;
const Type* Ty;
public:
@@ -108,8 +109,8 @@ namespace {
return new AllocaInst(Ty, ".nongc_mem", Begin); // FIXME: align?
}
FunctionInfo(unsigned typeInfoArgNr, bool safeToDelete)
: TypeInfoArgNr(typeInfoArgNr), SafeToDelete(safeToDelete) {}
FunctionInfo(LLVMContext* context, unsigned typeInfoArgNr, bool safeToDelete)
: Context(context), TypeInfoArgNr(typeInfoArgNr), SafeToDelete(safeToDelete) {}
};
class ArrayFI : public FunctionInfo {
@@ -118,9 +119,9 @@ namespace {
bool Initialized;
public:
ArrayFI(unsigned tiArgNr, bool safeToDelete, bool initialized,
unsigned arrSizeArgNr)
: FunctionInfo(tiArgNr, safeToDelete),
ArrayFI(LLVMContext* context, unsigned tiArgNr, bool safeToDelete,
bool initialized, unsigned arrSizeArgNr)
: FunctionInfo(context, tiArgNr, safeToDelete),
ArrSizeArgNr(arrSizeArgNr),
Initialized(initialized)
{}
@@ -222,7 +223,7 @@ namespace {
if (hasDestructor == NULL || hasCustomDelete == NULL)
return false;
if (ConstantExpr::getOr(hasDestructor, hasCustomDelete)
if (Context->getConstantExprOr(hasDestructor, hasCustomDelete)
!= ConstantInt::getFalse())
return false;
@@ -232,7 +233,7 @@ namespace {
// The default promote() should be fine.
AllocClassFI() : FunctionInfo(~0u, true) {}
AllocClassFI(LLVMContext* context) : FunctionInfo(context, ~0u, true) {}
};
}
@@ -285,9 +286,10 @@ FunctionPass *createGarbageCollect2Stack() {
GarbageCollect2Stack::GarbageCollect2Stack()
: FunctionPass(&ID),
AllocMemoryT(0, true),
NewArrayVT(0, true, false, 1),
NewArrayT(0, true, true, 1)
AllocMemoryT(Context, 0, true),
NewArrayVT(Context, 0, true, false, 1),
NewArrayT(Context, 0, true, true, 1),
AllocClass(Context)
{
KnownFunctions["_d_allocmemoryT"] = &AllocMemoryT;
KnownFunctions["_d_newarrayvT"] = &NewArrayVT;