# HG changeset patch
# User Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
# Date 1217772600 -7200
# Node ID e381e082d5cb828ad05baa21d528059bf59d65c3
# Parent  3a5d6ff8c70fcf2992a6794ba225fb52c43bd4ad
Fixed problem with using the variable names _arguments and _argptr in non D-style vararg functions.
Fixed problem with compiling with LLVM 2.3

diff -r 3a5d6ff8c70f -r e381e082d5cb gen/toir.cpp
--- a/gen/toir.cpp	Sat Aug 02 22:54:46 2008 +0200
+++ b/gen/toir.cpp	Sun Aug 03 16:10:00 2008 +0200
@@ -60,19 +60,17 @@
         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
diff -r 3a5d6ff8c70f -r e381e082d5cb gen/tollvm.cpp
--- a/gen/tollvm.cpp	Sat Aug 02 22:54:46 2008 +0200
+++ b/gen/tollvm.cpp	Sun Aug 03 16:10:00 2008 +0200
@@ -556,7 +556,7 @@
 {
     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;
 }