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

[svn r213] Fixed: foreach on an object seems to have been broken, the issue was that DMD generates an implicit delegate with conflicting types for 'this'.

Browse Source 
Fixed: string switch runtime support had wrong param types.
Fixed: string switch on a temporary slice was broken.
This commit is contained in:
Tomas Lindquist Olsen
2008-05-12 20:02:52 +02:00
parent 300fb29905
commit 941e36fa47
3 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gen/runtime.cpp
View File

@@ -145,6 +145,14 @@ static const llvm::Type* rt_array(const llvm::Type* elemty)
return rt_ptr(llvm::StructType::get(t));
}
static const llvm::Type* rt_array2(const llvm::Type* elemty)
{
std::vector<const llvm::Type*> t;
t.push_back(DtoSize_t());
t.push_back(rt_ptr(elemty));
return llvm::StructType::get(t);
}
static const llvm::Type* rt_dg1()
{
std::vector<const llvm::Type*> types;
@@ -705,7 +713,7 @@ static void LLVM_D_BuildRuntimeModule()
{
std::string fname("_d_switch_string");
std::vector<const llvm::Type*> types;
types.push_back(rt_array(stringTy));
types.push_back(rt_array(rt_array2(byteTy)));
types.push_back(stringTy);
const llvm::FunctionType* fty = llvm::FunctionType::get(intTy, types, false);
new llvm::Function(fty, llvm::GlobalValue::ExternalLinkage, fname, M);
@@ -715,7 +723,7 @@ static void LLVM_D_BuildRuntimeModule()
{
std::string fname("_d_switch_ustring");
std::vector<const llvm::Type*> types;
types.push_back(rt_array(wstringTy));
types.push_back(rt_array(rt_array2(shortTy)));
types.push_back(wstringTy);
const llvm::FunctionType* fty = llvm::FunctionType::get(intTy, types, false);
new llvm::Function(fty, llvm::GlobalValue::ExternalLinkage, fname, M);
@@ -725,7 +733,7 @@ static void LLVM_D_BuildRuntimeModule()
{
std::string fname("_d_switch_dstring");
std::vector<const llvm::Type*> types;
types.push_back(rt_array(dstringTy));
types.push_back(rt_array(rt_array2(intTy)));
types.push_back(dstringTy);
const llvm::FunctionType* fty = llvm::FunctionType::get(intTy, types, false);
new llvm::Function(fty, llvm::GlobalValue::ExternalLinkage, fname, M);

21
gen/statements.cpp
View File

@@ -602,8 +602,27 @@ static llvm::Value* call_string_switch_runtime(llvm::GlobalVariable* table, Expr
llvm::Function* fn = LLVM_D_GetRuntimeFunction(gIR->module, fname);
std::vector<llvm::Value*> args;
Logger::cout() << *table->getType() << '\n';
Logger::cout() << *fn->getFunctionType()->getParamType(0) << '\n';
assert(table->getType() == fn->getFunctionType()->getParamType(0));
args.push_back(table);
args.push_back(e->toElem(gIR)->getRVal());
DValue* val = e->toElem(gIR);
llvm::Value* llval;
if (DSliceValue* sval = val->isSlice())
{
// give storage
llval = new llvm::AllocaInst(DtoType(e->type), "tmp", gIR->topallocapoint());
DVarValue* vv = new DVarValue(e->type, llval, true);
DtoAssign(vv, val);
}
else
{
llval = val->getRVal();
}
assert(llval->getType() == fn->getFunctionType()->getParamType(1));
args.push_back(llval);
return gIR->ir->CreateCall(fn, args.begin(), args.end(), "tmp");
}

5
gen/toir.cpp
View File

@@ -1510,6 +1510,9 @@ DValue* ThisExp::toElem(IRState* p)
v = p->func()->decl->ir.irFunc->thisVar;
if (llvm::isa<llvm::AllocaInst>(v))
v = new llvm::LoadInst(v, "tmp", p->scopebb());
const llvm::Type* t = DtoType(type);
if (v->getType() != t)
v = DtoBitCast(v, t, "tmp");
return new DThisValue(vd, v);
}
@@ -1680,7 +1683,7 @@ DValue* CmpExp::toElem(IRState* p)
Type* t = DtoDType(e1->type);
Type* e2t = DtoDType(e2->type);
assert(t == e2t);
assert(DtoType(t) == DtoType(e2t));
llvm::Value* eval = 0;