Changeset 715:30b42a283c8e

Timestamp:

10/22/08 08:55:33 (3 years ago)

Author:

Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>

branch:

default

Message:

Removed TypeOpaque? from DMD.
Changed runtime functions taking opaque[] to void[].
Implemented proper type painting, to avoid "resizing" array casts in runtime calls that previously took opaque[].
Implemented dynamic arrays as first class types, this implements proper ABI for these types on x86.
Added dwarf region end after call to assert function, fixes some problems with llvm not allowing this to be missing.
Reverted change to WithStatement? from rev [704] it breaks MiniD, mini/with2.d needs to be fixed some other way...
Fixed tango bug 1339 in runtime, problem with _adReverseChar on invalid UTF-8.
Disabled .bc generation in the compiler runtime part, genobj.d triggers some llvm bug when using debug info. the .o seems to work fine.

Files:

• dmd/impcnvtab.c (modified) (1 diff)
• dmd/mtype.c (modified) (12 diffs)
• dmd/mtype.h (modified) (3 diffs)
• dmd/statement.c (modified) (4 diffs)
• gen/arrays.cpp (modified) (8 diffs)
• gen/dvalue.cpp (modified) (1 diff)
• gen/dvalue.h (modified) (3 diffs)
• gen/functions.cpp (modified) (5 diffs)
• gen/llvmhelpers.cpp (modified) (6 diffs)
• gen/llvmhelpers.h (modified) (1 diff)
• gen/runtime.cpp (modified) (17 diffs)
• gen/statements.cpp (modified) (7 diffs)
• gen/tocall.cpp (modified) (3 diffs)
• gen/toir.cpp (modified) (3 diffs)
• gen/tollvm.cpp (modified) (7 diffs)
• gen/tollvm.h (modified) (1 diff)
• gen/toobj.cpp (modified) (1 diff)
• runtime/internal/aApply.d (modified) (3 diffs)
• runtime/internal/aaA.d (modified) (7 diffs)
• runtime/internal/adi.d (modified) (7 diffs)
• runtime/internal/ldc.mak (modified) (3 diffs)
• runtime/internal/lifetime.d (modified) (3 diffs)
• runtime/internal/qsort2.d (modified) (2 diffs)
• tests/mini/foreach6.d (modified) (1 diff)
• tests/mini/foreach8.d (modified) (2 diffs)

dmd/impcnvtab.c

@@ -3 +3 @@
-unsigned char Type::impcnvResult[TMAX][TMAX] =
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-};
-unsigned char Type::impcnvType1[TMAX][TMAX] =
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-};
-unsigned char Type::impcnvType2[TMAX][TMAX] =
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-};
-unsigned char Type::impcnvWarn[TMAX][TMAX] =
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-};

dmd/mtype.c

@@ -104 +104 @@
-ClassDeclaration *Type::typeinfotypelist;
-
-// LDC
-Type* Type::topaque;
-
-Type *Type::tvoidptr;
-Type *Type::basic[TMAX];
@@ -211 +208 @@
-    mangleChar[Tslice] = '@';
-
-    // LDC
-    mangleChar[Topaque] = 'O';
-
-    for (i = 0; i < TMAX; i++)
-    {   if (!mangleChar[i])
@@ -234 +228 @@
-
-    tvoidptr = tvoid->pointerTo();
-
-    // LDC
-    topaque = new TypeOpaque();
-
-    // set size_t / ptrdiff_t types and pointer size
@@ -1626 +1617 @@
-        Arguments* args = new Arguments;
-        args->push(new Argument(STCin, Type::typeinfo->type, NULL, NULL));
-opaque
-opaque
+void
+void
-    }
-    static FuncDeclaration *adReverse_fd = NULL;
-    if(!adReverse_fd) {
-        Arguments* args = new Arguments;
-opaque
+void
-        args->push(new Argument(STCin, Type::tsize_t, NULL, NULL));
-opaque
+void
-    }
-
@@ -1645 +1636 @@
-    if (dup)
-        arguments->push(getTypeInfo(sc));
-
+
+
+
+
+
+
+
+
-    if (!dup)
-        arguments->push(new IntegerExp(0, size, Type::tint32));
@@ -1661 +1659 @@
-    if(!adSort_fd) {
-        Arguments* args = new Arguments;
-opaque
+void
-        args->push(new Argument(STCin, Type::typeinfo->type, NULL, NULL));
-opaque
+void
-    }
-    static FuncDeclaration *adSortBit_fd = NULL;
-    if(!adSortBit_fd) {
-        Arguments* args = new Arguments;
-opaque
+void
-        args->push(new Argument(STCin, Type::typeinfo->type, NULL, NULL));
-opaque
+void
-    }
-
@@ -1679 +1677 @@
-    e = e->castTo(sc, n->arrayOf());    // convert to dynamic array
-    arguments = new Expressions();
-
+
+
+
+
+
+
+
+
-    if (next->ty != Tbit)
-        arguments->push(n->getTypeInfo(sc));   // LDC, we don't support the getInternalTypeInfo
@@ -2351 +2356 @@
-    if(!aaLen_fd) {
-        Arguments* args = new Arguments;
-opaque
+void
-        aaLen_fd = FuncDeclaration::genCfunc(args, Type::tsize_t, Id::aaLen);
-    }
@@ -2372 +2377 @@
-    if(!aaKeys_fd) {
-        Arguments* args = new Arguments;
-opaque
+void
-        args->push(new Argument(STCin, Type::tsize_t, NULL, NULL));
-opaque
+void
-    }
-
@@ -2393 +2398 @@
-    if(!aaValues_fd) {
-        Arguments* args = new Arguments;
-opaque
+void
-        args->push(new Argument(STCin, Type::tsize_t, NULL, NULL));
-        args->push(new Argument(STCin, Type::tsize_t, NULL, NULL));
-opaque
+void
-    }
-
@@ -2418 +2423 @@
-    if(!aaRehash_fd) {
-        Arguments* args = new Arguments;
-opaque
+void
-        args->push(new Argument(STCin, Type::typeinfo->type, NULL, NULL));
-        aaRehash_fd = FuncDeclaration::genCfunc(args, Type::tvoidptr, Id::aaRehash);
@@ -5243 +5248 @@
-}
-
-void TypeOpaque::toCBuffer2(OutBuffer *buf, HdrGenState *hgs, int mod)
-{
-    //printf("TypeOpaquePtr::toCBuffer2()");
-    if (mod != this->mod)
-    {   toCBuffer3(buf, hgs, mod);
-    return;
-    }
-   buf->writestring("opaque");
-}
-
-/***************************** Argument *****************************/
-

dmd/mtype.h

@@ -99 +99 @@
-    Tslice,
-
-// LDC
-    Topaque,
-
-    TMAX
-};
@@ -177 +174 @@
-    static ClassDeclaration *typeinfodelegate;
-    static ClassDeclaration *typeinfotypelist;
-
-    // LDC, for runtime function signatures that contain
-    // AAs or arrays of unknown type
-    static Type* topaque;
-
-    static Type *basic[TMAX];
@@ -675 +668 @@
-};
-
-//LDC
-struct TypeOpaque : Type
-{ 
-    TypeOpaque() : Type(Topaque, NULL) {}
-    void toCBuffer2(OutBuffer *buf, HdrGenState *hgs, int mod);
-};
-
-/**************************************************************/
-

dmd/statement.c

@@ -1603 +1603 @@
-        if(!aaApply2_fd) {
-            Arguments* args = new Arguments;
-opaque
+void
-            args->push(new Argument(STCin, Type::tsize_t, NULL, NULL));
-            Arguments* dgargs = new Arguments;
@@ -1615 +1615 @@
-        if(!aaApply_fd) {
-            Arguments* args = new Arguments;
-opaque
+void
-            args->push(new Argument(STCin, Type::tsize_t, NULL, NULL));
-            Arguments* dgargs = new Arguments;
@@ -1670 +1670 @@
-        //LDC: Build arguments.
-        Arguments* args = new Arguments;
-Type::topaque
+tn
-        if (dim == 2) {
-            Arguments* dgargs = new Arguments;
@@ -1690 +1690 @@
-        if (tab->ty == Tsarray)
-           aggr = aggr->castTo(sc, tn->arrayOf());
-       
+        
-        exps->push(flde);
-        e = new CallExp(loc, ec, exps);

gen/arrays.cpp

@@ -56 +56 @@
-    LOG_SCOPE;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-}
-
@@ -685 +639 @@
-    assert(fn);
-
+    // find common dynamic array type
+    Type* commonType = l->getType()->toBasetype()->nextOf()->arrayOf();
+
+    // cast static arrays to dynamic ones, this turns them into DSliceValues
+    Logger::println("casting to dynamic arrays");
+    l = DtoCastArray(loc, l, commonType);
+    r = DtoCastArray(loc, r, commonType);
+
-    LLValue* lmem;
-    LLValue* rmem;
-
-    // cast static arrays to dynamic ones, this turns them into DSliceValues
-    Logger::println("casting to dynamic arrays");
-    Type* l_ty = l->getType()->toBasetype();
-    Type* r_ty = r->getType()->toBasetype();
-    assert(l_ty->next == r_ty->next);
-    if ((l_ty->ty == Tsarray) || (r_ty->ty == Tsarray)) {
-        Type* a_ty = l_ty->next->arrayOf();
-        if (l_ty->ty == Tsarray)
-            l = DtoCastArray(loc, l, a_ty);
-        if (r_ty->ty == Tsarray)
-            r = DtoCastArray(loc, r, a_ty);
-    }
-
-    Logger::println("giving storage");
-
-    // we need to give slices storage
-    if (l->isSlice()) {
-        lmem = DtoAlloca(DtoType(l->getType()), "tmpparam");
-        DtoSetArray(lmem, DtoArrayLen(l), DtoArrayPtr(l));
-    }
-    // also null
-    else if (l->isNull())
-    {
-        lmem = DtoAlloca(DtoType(l->getType()), "tmpparam");
-        DtoSetArray(lmem, llvm::Constant::getNullValue(DtoSize_t()), llvm::Constant::getNullValue(DtoType(l->getType()->next->pointerTo())));
-    }
-    else
-        lmem = l->getRVal();
-
-    // and for the rvalue ...
-    // we need to give slices storage
-    if (r->isSlice()) {
-        rmem = DtoAlloca(DtoType(r->getType()), "tmpparam");
-        DtoSetArray(rmem, DtoArrayLen(r), DtoArrayPtr(r));
-    }
-    // also null
-    else if (r->isNull())
-    {
-        rmem = DtoAlloca(DtoType(r->getType()), "tmpparam");
-        DtoSetArray(rmem, llvm::Constant::getNullValue(DtoSize_t()), llvm::Constant::getNullValue(DtoType(r->getType()->next->pointerTo())));
-    }
-    else
-        rmem = r->getRVal();
-
-    const LLType* pt = fn->getFunctionType()->getParamType(0);
-
-    LLSmallVector<LLValue*, 3> args;
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-    // pass array typeinfo ?
@@ -754 +668 @@
-            Logger::cout() << "typeinfo decl: " << *tival << '\n';
-
-
-
+
-    }
-
-    CallOrInvoke* call = gIR->CreateCallOrInvoke(fn, args.begin(), args.end(), "tmp");
-
-    // set param attrs
-    llvm::AttrListPtr palist;
-    palist = palist.addAttr(1, llvm::Attribute::ByVal);
-    palist = palist.addAttr(2, llvm::Attribute::ByVal);
-    call->setAttributes(palist);
-
-    return call->get();
@@ -918 +825 @@
-        else if (v->isNull())
-            return DtoConstSize_t(0);
-
+
+
+
-    }
-    else if (t->ty == Tsarray) {
@@ -944 +853 @@
-        else if (v->isNull())
-            return getNullPtr(getPtrToType(DtoType(t->next)));
-
+
+
+
-    }
-    else if (t->ty == Tsarray) {
@@ -1047 +958 @@
-}
-
-
-//////////////////////////////////////////////////////////////////////////////////////////
-void DtoArrayBoundsCheck(Loc& loc, DValue* arr, DValue* index, bool isslice)
@@ -1072 +982 @@
-
-    std::vector<LLValue*> args;
-    llvm::AttrListPtr palist;
-
-    // file param
-
-
+
-
-    // line param
@@ -1085 +993 @@
-    llvm::Function* errorfn = LLVM_D_GetRuntimeFunction(gIR->module, "_d_array_bounds");
-    CallOrInvoke* call = gIR->CreateCallOrInvoke(errorfn, args.begin(), args.end());
-    call->setAttributes(palist);
-
-    // the function does not return
-    gIR->ir->CreateUnreachable();
-
-
-    // if ok, proceed in okbb
-    gIR->scope() = IRScope(okbb, oldend);

gen/dvalue.cpp

@@ -44 +44 @@
-/////////////////////////////////////////////////////////////////////////////////////////////////
-
+LLValue* DSliceValue::getRVal()
+{
+    assert(len);
+    assert(ptr);
+    return DtoAggrPair(len, ptr);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////////////////////////
+
-DFuncValue::DFuncValue(FuncDeclaration* fd, LLValue* v, LLValue* vt)
-{

gen/dvalue.h

@@ -30 +30 @@
-struct DFuncValue;
-struct DSliceValue;
-struct DArrayLenValue;
-struct DLRValue;
-
@@ -50 +49 @@
-    virtual DSliceValue* isSlice() { return NULL; }
-    virtual DFuncValue* isFunc() { return NULL; }
-    virtual DArrayLenValue* isArrayLen() { return NULL; }
-    virtual DLRValue* isLRValue() { return NULL; }
-
@@ -128 +126 @@
-    DSliceValue(Type* t, LLValue* l, LLValue* p) { type=t; ptr=p; len=l; }
-
+    virtual LLValue* getRVal();
+
-    virtual Type*& getType() { assert(type); return type; }
-    virtual DSliceValue* isSlice() { return this; }

gen/functions.cpp

@@ -60 +60 @@
-        const LLType* arrTy = DtoArrayType(LLType::Int8Ty);
-        const LLType* arrArrTy = DtoArrayType(arrTy);
-getPtrToType(arrArrTy)
+arrArrTy
-        }
-    }
@@ -104 +104 @@
-        types.push_back(getPtrToType(getPtrToType(ti->ir.irStruct->constInit->getType())));
-        const LLType* t1 = llvm::StructType::get(types);
-getPtrToType(t1)
+t1
-        paramvec.push_back(getPtrToType(LLType::Int8Ty));
-    }
@@ -124 +124 @@
-        const LLType* at = DtoType(argT);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-            Logger::println("opaque param");
-            assert(argT->ty == Tstruct || argT->ty == Tclass);
-            paramvec.push_back(getPtrToType(at));
-        }
+        // structs and delegates are passed as a reference, but by value
+        else if (argT->ty == Tstruct || argT->ty == Tdelegate) {
+            Logger::println("struct/sarray param");
+            if (!refOrOut)
+                arg->llvmAttrs |= llvm::Attribute::ByVal;
+            paramvec.push_back(getPtrToType(at));
+        }
+        // static arrays are passed directly by reference
+        else if (argT->ty == Tsarray)
+        {
+            Logger::println("static array param");
+            at = getPtrToType(at);
+            paramvec.push_back(at);
+        }
+        // firstclass ' ref/out ' parameter
+        else if (refOrOut) {
+            Logger::println("ref/out param");
+            at = getPtrToType(at);
+            paramvec.push_back(at);
+        }
+        // firstclass ' in ' parameter
-        else {
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-            paramvec.push_back(at);
-        }
@@ -361 +357 @@
-        PAWI.Attrs = llvm::Attribute::StructRet;
-        attrs.push_back(PAWI);
-    }
-
-    // set byval attrs on implicit main arg
-    if (fdecl->isMain() && Argument::dim(f->parameters) == 0)
-    {
-        PAWI.Index = llidx;
-        PAWI.Attrs = llvm::Attribute::ByVal;
-        attrs.push_back(PAWI);
-        llidx++;
-    }
-
@@ -776 +763 @@
-    }
-
-
+and _arguments 
-    if (f->linkage == LINKd && f->varargs == 1)
-    {
+        // _argptr
-        LLValue* argptrmem = DtoAlloca(fd->ir.irFunc->_argptr->getType(), "_argptr_mem");
-        new llvm::StoreInst(fd->ir.irFunc->_argptr, argptrmem, gIR->scopebb());
-        fd->ir.irFunc->_argptr = argptrmem;
+
+        // _arguments
+        LLValue* argumentsmem = DtoAlloca(fd->ir.irFunc->_arguments->getType(), "_arguments_mem");
+        new llvm::StoreInst(fd->ir.irFunc->_arguments, argumentsmem, gIR->scopebb());
+        fd->ir.irFunc->_arguments = argumentsmem;
-    }
-

gen/llvmhelpers.cpp

@@ -118 +118 @@
-    llvm::Function* fn = LLVM_D_GetRuntimeFunction(gIR->module, fname);
-
-    // param attrs
-    llvm::AttrListPtr palist;
-    int idx = 1;
-
-    // msg param
-    if (msg)
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    }
-
-    // file param
-
-
-
+
-
-    // line param
@@ -154 +133 @@
-    // call
-    CallOrInvoke* call = gIR->CreateCallOrInvoke(fn, args.begin(), args.end());
-
+
+
+
+
-
-    // after assert is always unreachable
@@ -446 +428 @@
-        }
-        // reference assignment
+        else if (t2->ty == Tarray) {
+            DtoStore(rhs->getRVal(), lhs->getLVal());
+        }
+        // some implicitly converting ref assignment
-        else {
-ArrayAssign(lhs->getLVal(), rhs->getRVal(
+SetArray(lhs->getLVal(), DtoArrayLen(rhs), DtoArrayPtr(rhs
-        }
-    }
@@ -754 +740 @@
-        error(loc, "invalid cast from '%s' to '%s'", val->getType()->toChars(), to->toChars());
-        fatal();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////
+
+DValue* DtoPaintType(Loc& loc, DValue* val, Type* to)
+{
+    Type* from = val->getType()->toBasetype();
+    Logger::println("repainting from '%s' to '%s'", from->toChars(), to->toChars());
+
+    if (from->ty == Tarray)
+    {
+        Type* at = to->toBasetype();
+        assert(at->ty == Tarray);
+        Type* elem = at->next->pointerTo();
+        if (DSliceValue* slice = val->isSlice())
+        {
+            return new DSliceValue(to, slice->len, DtoBitCast(slice->ptr, DtoType(elem)));
+        }
+        else if (val->isLVal())
+        {
+            LLValue* ptr = val->getLVal();
+            ptr = DtoBitCast(ptr, DtoType(at->pointerTo()));
+            return new DVarValue(to, ptr);
+        }
+        else
+        {
+            LLValue *len, *ptr;
+            len = DtoArrayLen(val);
+            ptr = DtoArrayPtr(val);
+            ptr = DtoBitCast(ptr, DtoType(elem));
+            return new DImValue(to, DtoAggrPair(len, ptr, "tmp"));
+        }
+    }
+    else if (from->ty == Tpointer || from->ty == Tclass || from->ty == Taarray)
+    {
+        Type* b = to->toBasetype();
+        assert(b->ty == Tpointer || b->ty == Tclass || b->ty == Taarray);
+        LLValue* ptr = DtoBitCast(val->getRVal(), DtoType(b));
+        return new DImValue(to, ptr);
+    }
+    else
+    {
+        assert(!val->isLVal());
+        assert(DtoType(to) == DtoType(to));
+        return new DImValue(to, val->getRVal());
-    }
-}
@@ -1414 +1446 @@
-static LLConstant* expand_to_sarray(Type *base, Expression* exp)
-{
-from
+to
-    const LLType* dstTy = DtoType(base);
-    if (Logger::enabled())
@@ -1464 +1496 @@
-        if (base->ty == Tsarray)
-        {
-from
+to
-            return expand_to_sarray(base, exp);
-        }
-        else
-        {
-from
+to
-            fatal();
-        }

gen/llvmhelpers.h

@@ -58 +58 @@
-DValue* DtoCastDelegate(Loc& loc, DValue* val, Type* to);
-DValue* DtoCast(Loc& loc, DValue* val, Type* to);
+
+// return the same val as passed in, modified to the target type, if possible, otherwise returns a new DValue
+DValue* DtoPaintType(Loc& loc, DValue* val, Type* to);
-
-// is template instance check

gen/runtime.cpp

@@ -111 +111 @@
-static const LLType* rt_array(const LLType* elemty)
-{
-
-
-
-
-
-
-
-
-
-
-
-
+
-}
-
@@ -200 +189 @@
-        types.push_back(intTy);
-        const llvm::FunctionType* fty = llvm::FunctionType::get(voidTy, types, false);
-
-
-
-
-
+
+
+
-    }
-
@@ -215 +202 @@
-        types.push_back(intTy);
-        const llvm::FunctionType* fty = llvm::FunctionType::get(voidPtrTy, types, false);
-
-
-
-
+
-    }
-
@@ -383 +367 @@
-        const llvm::FunctionType* fty = llvm::FunctionType::get(intTy, types, false); \
-        llvm::AttrListPtr palist; \
-        palist = palist.addAttr(1, llvm::Attribute::ByVal); \
-        palist = palist.addAttr(2, llvm::Attribute::ByVal); \
-        llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M)->setAttributes(palist); \
@@ -403 +386 @@
-        const llvm::FunctionType* fty = llvm::FunctionType::get(intTy, types, false); \
-        llvm::AttrListPtr palist; \
-        palist = palist.addAttr(1, llvm::Attribute::ByVal); \
-        palist = palist.addAttr(2, llvm::Attribute::ByVal); \
-        llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M)->setAttributes(palist); \
@@ -422 +404 @@
-        const llvm::FunctionType* fty = llvm::FunctionType::get(intTy, types, false); \
-        llvm::AttrListPtr palist; \
-        palist = palist.addAttr(1, llvm::Attribute::ByVal); \
-        palist = palist.addAttr(2, llvm::Attribute::ByVal); \
-        llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M)->setAttributes(palist); \
@@ -441 +422 @@
-        const llvm::FunctionType* fty = llvm::FunctionType::get(intTy, types, false); \
-        llvm::AttrListPtr palist; \
-        palist = palist.addAttr(1, llvm::Attribute::ByVal); \
-        palist = palist.addAttr(2, llvm::Attribute::ByVal); \
-        llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M)->setAttributes(palist); \
@@ -471 +451 @@
-    /////////////////////////////////////////////////////////////////////////////////////
-
-    // builds the d string[] for the D main args from the C main args
-    // void _d_main_args(uint n, char** args, ref char[][] res)
-    {
-        std::string fname("_d_main_args");
-        std::vector<const LLType*> types;
-        types.push_back(intTy);
-        types.push_back(rt_ptr(rt_ptr(byteTy)));
-        types.push_back(rt_array(stringTy->getContainedType(0)));
-        const llvm::FunctionType* fty = llvm::FunctionType::get(voidTy, types, false);
-        llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M);
-    }
-
-    /////////////////////////////////////////////////////////////////////////////////////
-    /////////////////////////////////////////////////////////////////////////////////////
-    /////////////////////////////////////////////////////////////////////////////////////
-
-    // cast to object
-    // Object _d_toObject(void* p)
@@ -530 +494 @@
-        std::vector<const LLType*> types;
-        types.push_back(stringTy);
-
-
-
-
-
-
+
+
+
-    }
-
@@ -545 +506 @@
-        std::vector<const LLType*> types;
-        types.push_back(wstringTy);
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-    {
-        std::string fname("_adReverse");
+        std::vector<const LLType*> types;
+        types.push_back(rt_array(byteTy));
+        types.push_back(sizeTy);
+        const llvm::FunctionType* fty = llvm::FunctionType::get(rt_array(byteTy), types, false);
+        llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M);
+    }
+
+    // void[] _adDupT(TypeInfo ti, void[] a)
+    {
+        std::string fname("_adDupT");
+        std::vector<const LLType*> types;
+        types.push_back(typeInfoTy);
+        types.push_back(rt_array(byteTy));
+        const llvm::FunctionType* fty = llvm::FunctionType::get(rt_array(byteTy), types, false);
+        llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M);
+    }
+
+    // int _adEq(void[] a1, void[] a2, TypeInfo ti)
+    // int _adCmp(void[] a1, void[] a2, TypeInfo ti)
+    {
+        std::string fname("_adEq");
+        std::string fname2("_adCmp");
-        std::vector<const LLType*> types;
-        types.push_back(rt_array(byteTy));
-        types.push_back(rt_array(byteTy));
-        types.push_back(sizeTy);
-        const llvm::FunctionType* fty = llvm::FunctionType::get(voidTy, types, false);
-        llvm::AttrListPtr palist;
-        palist = palist.addAttr(2, llvm::Attribute::ByVal);
-        llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M)->setAttributes(palist);
-    }
-
-    // Array _adDupT(TypeInfo ti, Array a)
-    {
-        std::string fname("_adDupT");
-        std::vector<const LLType*> types;
-        types.push_back(rt_array(byteTy));
-        types.push_back(typeInfoTy);
-        types.push_back(rt_array(byteTy));
-        const llvm::FunctionType* fty = llvm::FunctionType::get(voidTy, types, false);
-        llvm::AttrListPtr palist;
-        palist = palist.addAttr(3, llvm::Attribute::ByVal);
-        llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M)->setAttributes(palist);
-    }
-
-    // int _adEq(Array a1, Array a2, TypeInfo ti)
-    // int _adCmp(Array a1, Array a2, TypeInfo ti)
-    {
-        std::string fname("_adEq");
-        std::string fname2("_adCmp");
-        std::vector<const LLType*> types;
-        types.push_back(rt_array(byteTy));
-        types.push_back(rt_array(byteTy));
-        types.push_back(typeInfoTy);
-        const llvm::FunctionType* fty = llvm::FunctionType::get(intTy, types, false);
-
-
-
-
-
-
-
-
+
+
+
+
+
-    {
-        std::string fname("_adCmpChar");
@@ -603 +552 @@
-        types.push_back(rt_array(byteTy));
-        const llvm::FunctionType* fty = llvm::FunctionType::get(intTy, types, false);
-
-
-
-
-
-
-
+
+
+
+
-    {
-        std::string fname("_adSort");
-        std::vector<const LLType*> types;
-        types.push_back(rt_array(byteTy));
-
-
-
-
-
-
+
+
+
-    }
-
@@ -681 +624 @@
-    }
-
-ArrayRet_t
+void[]
-    {
-        std::string fname("_aaValues");
-        std::vector<const LLType*> types;
-
-
-
-
-
+
+
+
+
-        llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M);
-    }
@@ -703 +645 @@
-    }
-
-ArrayRet_t
+void[]
-    {
-        std::string fname("_aaKeys");
-        std::vector<const LLType*> types;
-
-
-
-
+
+
+
-        llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M);
-    }
@@ -733 +674 @@
-        types.push_back(aaTy);
-        types.push_back(sizeTy);
-1
+2
-        const llvm::FunctionType* fty = llvm::FunctionType::get(intTy, types, false);
-        llvm::AttrListPtr palist;
@@ -809 +750 @@
-        std::string fname("_d_switch_string");
-        std::vector<const LLType*> types;
-rt_array2(byteTy)
+stringTy
-        types.push_back(stringTy);
-        const llvm::FunctionType* fty = llvm::FunctionType::get(intTy, types, false);
-
-
-
-
+
-    }
-
@@ -822 +760 @@
-        std::string fname("_d_switch_ustring");
-        std::vector<const LLType*> types;
-rt_array2(shortTy)
+wstringTy
-        types.push_back(wstringTy);
-        const llvm::FunctionType* fty = llvm::FunctionType::get(intTy, types, false);
-
-
-
-
+
-    }
-
@@ -835 +770 @@
-        std::string fname("_d_switch_dstring");
-        std::vector<const LLType*> types;
-rt_array2(intTy)
+dstringTy
-        types.push_back(dstringTy);
-        const llvm::FunctionType* fty = llvm::FunctionType::get(intTy, types, false);
-
-
-
-
+
-    }
-

gen/statements.cpp

@@ -677 +677 @@
-};
-
-GlobalVariabl
+Valu
-{
-    Type* dt = e->type->toBasetype();
@@ -706 +706 @@
-
-    DValue* val = e->toElem(gIR);
-
-
-
-
-
-
-
-
-
-
-
-
+
-    assert(llval->getType() == fn->getFunctionType()->getParamType(1));
-
-    CallOrInvoke* call = gIR->CreateCallOrInvoke2(fn, table, llval, "tmp");
-
-    llvm::AttrListPtr palist;
-    palist = palist.addAttr(1, llvm::Attribute::ByVal);
-    palist = palist.addAttr(2, llvm::Attribute::ByVal);
-    call->setAttributes(palist);
-
-    return call->get();
@@ -749 +733 @@
-
-    // string switch?
-GlobalVariabl
+Valu
-    Array caseArray;
-    if (!condition->type->isintegral())
@@ -791 +775 @@
-        sinits.push_back(DtoConstSize_t(inits.size()));
-        sinits.push_back(arrPtr);
-
-
-
+
-    }
-
@@ -1174 +1156 @@
-    DValue* e = exp->toElem(p);
-
+#if 1
+    // this doesn't handle the mini/with2.d test case ...
+    assert(!wthis->ir.isSet());
+    wthis->ir.irLocal = new IrLocal(wthis); 
+    wthis->ir.irLocal->value = DtoAlloca(DtoType(wthis->type), wthis->toChars());
+#else
+    // ... this does, but it also silently breaks MiniD!!!
-    DtoDeclarationExp(wthis);
+#endif
+
-    DtoStore(e->getRVal(), wthis->ir.irLocal->value);
-
@@ -1270 +1261 @@
-    llvm::Function* fn = LLVM_D_GetRuntimeFunction(gIR->module, "_d_switch_error");
-
-    // param attrs
-    llvm::AttrListPtr palist;
-    int idx = 1;
-
-    std::vector<LLValue*> args;
-
-    // file param
-
-
+
-
-    // line param
@@ -1286 +1272 @@
-    // call
-    CallOrInvoke* call = gIR->CreateCallOrInvoke(fn, args.begin(), args.end());
-    call->setAttributes(palist);
-
-    gIR->ir->CreateUnreachable();

gen/tocall.cpp

@@ -176 +176 @@
-
-    // specify arguments
-typeinfoarrayparam
+DtoLoad(typeinfoarrayparam)
-    ++argidx;
-    args.push_back(gIR->ir->CreateBitCast(mem, getPtrToType(LLType::Int8Ty), "tmp"));
@@ -320 +320 @@
-            if (fnarg) // can fnarg ever be null in this block?
-            {
-// 
-// 
-// 
-// 
-// 
+
+
+
+
+
-                if (arg->getType() != callableTy->getParamType(j))
-                    arg = DtoBitCast(arg, callableTy->getParamType(j));
@@ -356 +356 @@
-    LLValue* retllval = (retinptr) ? args[0] : call->get();
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    // set calling convention and parameter attributes

gen/toir.cpp

@@ -784 +784 @@
-    LOG_SCOPE;
-
+    // get the value to cast
-    DValue* u = e1->toElem(p);
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        return v;
-
-
+
-    else if(u->isLVal())
-        return new DLRValue(u, v);
-
-
-
+
+
-}
-
@@ -812 +817 @@
-
-    if(!isaPointer(c->getType()) || !isaPointer(lltype)) {
-mpile
+de generation
-        fatal();
-    }
@@ -1553 +1558 @@
-    {
-        DtoDeleteArray(dval);
-!dval->isSlice
-R
+dval->isLVal
+L
-    }
-    // unknown/invalid

gen/tollvm.cpp

@@ -26 +26 @@
-    Type* typ = type->toBasetype();
-    TY t = typ->ty;
-array || t == T
+
-}
-
@@ -33 +33 @@
-    Type* typ = type->toBasetype();
-    TY t = typ->ty;
-array || t == T
+
-}
-
@@ -180 +180 @@
-    }
-*/
-    // opaque type
-    case Topaque:
-        return llvm::OpaqueType::get();
-
-    default:
@@ -561 +558 @@
-LLValue* DtoLoad(LLValue* src, const char* name)
-{
+    if (Logger::enabled())
+        Logger::cout() << "loading " << *src <<  '\n';
-    LLValue* ld = gIR->ir->CreateLoad(src, name ? name : "tmp");
-    //ld->setVolatile(gIR->func()->inVolatile);
@@ -568 +567 @@
-void DtoStore(LLValue* src, LLValue* dst)
-{
+    if (Logger::enabled())
+        Logger::cout() << "storing " << *src << " into " << *dst << '\n';
-    LLValue* st = gIR->ir->CreateStore(src,dst);
-    //st->setVolatile(gIR->func()->inVolatile);
@@ -578 +579 @@
-    if (v->getType() == t)
-        return v;
+    assert(!(isaStruct(t) || isaStruct(v->getType())));
-    return gIR->ir->CreateBitCast(v, t, name ? name : "tmp");
-}
@@ -807 +809 @@
-    return gIR->ir->CreateInsertValue(res, V2, 1, name?name:"tmp");
-}
+
+LLValue* DtoAggrPair(LLValue* V1, LLValue* V2, const char* name)
+{
+    const LLType* t = LLStructType::get(V1->getType(), V2->getType(), 0);
+    return DtoAggrPair(t, V1, V2, name);
+}
+
+LLValue* DtoAggrPaint(LLValue* aggr, const LLType* as)
+{
+    if (aggr->getType() == as)
+        return aggr;
+
+    LLValue* res = llvm::UndefValue::get(as);
+
+    LLValue* V = gIR->ir->CreateExtractValue(aggr, 0, "tmp");;
+    V = DtoBitCast(V, as->getContainedType(0));
+    res = gIR->ir->CreateInsertValue(res, V, 0, "tmp");
+
+    V = gIR->ir->CreateExtractValue(aggr, 1, "tmp");;
+    V = DtoBitCast(V, as->getContainedType(1));
+    return gIR->ir->CreateInsertValue(res, V, 1, "tmp");
+}

gen/tollvm.h

@@ -99 +99 @@
-// pair type helpers
-LLValue* DtoAggrPair(const LLType* type, LLValue* V1, LLValue* V2, const char* name = 0);
+LLValue* DtoAggrPair(LLValue* V1, LLValue* V2, const char* name = 0);
+LLValue* DtoAggrPaint(LLValue* aggr, const LLType* as);
-
-/**

gen/toobj.cpp

@@ -76 +76 @@
-    LOG_SCOPE;
-
-//    
+    //
-
-    // start by deleting the old object file

runtime/internal/aApply.d

@@ -37 +37 @@
-private import util.utf;
-
+//debug = apply;
+debug(apply)
+{
+    extern(C) int printf(char*, ...);
+}
+
-/**********************************************
- */
@@ -357 +363 @@
-
-        d = aa[i];
+        debug(apply) printf("d = %u\n", d);
-        if (d & ~0x7F)
-        {
@@ -364 +371 @@
-            foreach (char c2; b)
-            {
+                debug(apply) printf("c2 = %d\n", c2);
-                result = dg(&i, cast(void *)&c2);
-                if (result)

runtime/internal/aaA.d

@@ -63 +63 @@
-//  8_589_934_513UL, 17_179_869_143UL
-];
-
-// This is the type of the return value for dynamic arrays.
-struct Array
-{
-    size_t length;
-    void* ptr;
-}
-
-struct aaA
@@ -450 +443 @@
- */
-
-Array
+void[]
-in
-{
@@ -458 +451 @@
-{
-    size_t resi;
-Array
+void[]
-
-    void _aaValues_x(aaA* e)
@@ -481 +474 @@
-    if (aa)
-    {
-.length
-.ptr = cast(byte*) gc_malloc(a.length
+uto len
+uto ptr = cast(byte*) gc_malloc(len
-                                      valuesize < (void*).sizeof ? BlkAttr.NO_SCAN : 0);
+        a = ptr[0 .. len];
-        resi = 0;
-        foreach (e; aa.b)
@@ -594 +588 @@
- */
-
-Array
+void[]
-{
-    byte[] res;
@@ -618 +612 @@
-    auto len = _aaLen(aa);
-    if (!len)
-Array()
+null
-    res = (cast(byte*) gc_malloc(len * keysize,
-                                 !(aa.keyti.flags() & 1) ? BlkAttr.NO_SCAN : 0)) [0 .. len * keysize];
@@ -629 +623 @@
-    assert(resi == len);
-
-Array(len, res.ptr)
+res.ptr[0 .. len]
-}
-

runtime/internal/adi.d

@@ -56 +56 @@
-
-
-struct Array
-{
-    size_t  length;
-    void*   ptr;
-}
-
-/**********************************************
- * Reverse array of chars.
@@ -93 +87 @@
-
-            uint stridelo = UTF8stride[clo];
+            // don't barf on invalid strides, just ignore it
+            if (stridelo == 0xFF)
+                stridelo = 1;
-
-            uint stridehi = 1;
@@ -246 +243 @@
- */
-
-Array _adReverse(Array
+void[] _adReverse(void[]
-    out (result)
-    {
@@ -288 +285 @@
-            }
-        }
-Array(a.length, a.ptr)
+a.ptr[0 .. a.length]
-    }
-
@@ -376 +373 @@
- */
-
-Array a1, Array
+void[] a1, void[]
-{
-    debug(adi) printf("_adEq(a1.length = %d, a2.length = %d)\n", a1.length, a2.length);
@@ -406 +403 @@
- */
-
-Array a1, Array
+void[] a1, void[]
-{
-    debug(adi) printf("adCmp()\n");
@@ -443 +440 @@
- */
-
-Array a1, Array
+void[] a1, void[]
-{
-  version(D_InlineAsm_X86)

runtime/internal/ldc.mak

@@ -65 +65 @@
-targets : lib sharedlib doc
-all     : lib sharedlib doc
-
+
+
-sharedlib : ldc.sharedlib
-doc     : ldc.doc
@@ -219 +220 @@
-######################################################
-
-
+#
-ldc.clib : $(LIB_TARGET_C_ONLY)
-ldc.lib : $(LIB_TARGET_FULL)
-ldc.sharedlib : $(LIB_TARGET_SHARED)
-
-
-
-
+#
+#
+#
-
-
@@ -251 +252 @@
-clean :
-    find . -name "*.di" | xargs $(RM)
-
+#
-    $(RM) $(ALL_OBJS_O)
-    $(RM) $(ALL_DOCS)

runtime/internal/lifetime.d

@@ -1093 +1093 @@
- * Support for array.dup property.
- */
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-out (result)
-{
@@ -1111 +1106 @@
-body
-{
-Array2 
+void* pt
-
-    if (a.length)
@@ -1117 +1112 @@
-        auto sizeelem = ti.next.tsize();                // array element size
-        auto size = a.length * sizeelem;
-
-
-
-
-
+
+
+
+
-}
-

runtime/internal/qsort2.d

@@ -18 +18 @@
-private import tango.stdc.stdlib;
-
-struct Array
-{
-    size_t length;
-    void*  ptr;
-}
-
-private TypeInfo tiglobal;
-
@@ -31 +25 @@
-}
-
-Array _adSort(Array
+void[] _adSort(void[]
-{
-    synchronized

tests/mini/foreach6.d

@@ -1 @@
-
+mini.
-
-struct S

tests/mini/foreach8.d

@@ -1 @@
-tangotests.foreach1
+mini.foreach8
-
-extern(C) int printf(char*, ...);
@@ -5 +5 @@
-int main(){
-    dchar[] array="\u2260";
+    printf("array[0] == %u\n", array[0]);
-    int test=0;
-    int count=0;