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

stupid merges

Browse Source
This commit is contained in:
Tomas Lindquist Olsen
2008-08-03 16:16:16 +02:00
parent 90693b23b1 0640b52d3e
commit 996c197aa8
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gen/toir.cpp
View File

@@ -60,19 +60,17 @@ DValue* VarExp::toElem(IRState* p)
Logger::println("VarDeclaration %s", vd->toChars());
// _arguments
if (vd->ident == Id::_arguments)
if (vd->ident == Id::_arguments && p->func()->_arguments)
{
Logger::println("Id::_arguments");
LLValue* v = p->func()->_arguments;
assert(v);
return new DVarValue(type, vd, v, true);
}
// _argptr
else if (vd->ident == Id::_argptr)
else if (vd->ident == Id::_argptr && p->func()->_argptr)
{
Logger::println("Id::_argptr");
LLValue* v = p->func()->_argptr;
assert(v);
return new DVarValue(type, vd, v, true);
}
// _dollar

2
gen/tollvm.cpp
View File

@@ -556,7 +556,7 @@ bool DtoCanLoad(LLValue* ptr)
{
if (isaPointer(ptr->getType())) {
const LLType* data = ptr->getType()->getContainedType(0);
return data->isFirstClassType() && !data->isAggregateType();
return data->isFirstClassType() && !(isaStruct(data) || isaArray(data));
}
return false;
}

1
tests/mini/compile_nested1.d Normal file
View File

@@ -0,0 +1 @@
void append(lazy char[] exp) { char[] s = exp; }