mirror of
https://github.com/xomboverlord/ldc.git
synced 2026-01-29 19:13:14 +01:00
Merge.
This commit is contained in:
@@ -201,7 +201,9 @@ const llvm::FunctionType* DtoFunctionType(Type* type, Type* thistype, Type* nest
|
||||
llvm::FunctionType* functype = llvm::FunctionType::get(f->fty.ret->ltype, argtypes, f->fty.c_vararg);
|
||||
f->ir.type = new llvm::PATypeHolder(functype);
|
||||
|
||||
#if 0
|
||||
Logger::cout() << "Final function type: " << *functype << "\n";
|
||||
#endif
|
||||
|
||||
return functype;
|
||||
}
|
||||
@@ -304,16 +306,6 @@ void DtoResolveFunction(FuncDeclaration* fdecl)
|
||||
return; // ignore declaration completely
|
||||
}
|
||||
|
||||
if (AggregateDeclaration* ad = fdecl->isMember())
|
||||
{
|
||||
ad->codegen(Type::sir);
|
||||
if (ad->isStructDeclaration() && llvm::isa<llvm::OpaqueType>(DtoType(ad->type)))
|
||||
{
|
||||
ad->ir.irStruct->structFuncs.push_back(fdecl);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
//printf("resolve function: %s\n", fdecl->toPrettyChars());
|
||||
|
||||
if (fdecl->parent)
|
||||
@@ -372,7 +364,6 @@ void DtoResolveFunction(FuncDeclaration* fdecl)
|
||||
// queue declaration unless the function is abstract without body
|
||||
if (!fdecl->isAbstract() || fdecl->fbody)
|
||||
{
|
||||
Logger::println("Ignoring declaration of abstract bodyless function %s", fdecl->toPrettyChars());
|
||||
DtoDeclareFunction(fdecl);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user