From bba1994b05a0536556eef9ea0b0331b405556b87 Mon Sep 17 00:00:00 2001
From: Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
Date: Thu, 11 Sep 2008 21:10:15 +0200
Subject: [PATCH] Fixed a few mini tests issues. Added 'darwin' and 'Posix' as
 versions user can't set. Fixed #80 .

---
 dmd/cond.c            |  2 +-
 gen/toir.cpp          | 14 +++++++++++---
 tests/mini/arrays16.d |  2 +-
 tests/mini/arrays17.d |  2 +-
 tests/mini/arrays18.d |  2 +-
 tests/mini/arrays19.d |  9 +++++++++
 tests/mini/arrays20.d | 23 +++++++++++++++++++++++
 tests/mini/complex5.d | 13 +++++++++++++
 8 files changed, 60 insertions(+), 7 deletions(-)
 create mode 100644 tests/mini/arrays19.d
 create mode 100644 tests/mini/arrays20.d
 create mode 100644 tests/mini/complex5.d

diff --git a/dmd/cond.c b/dmd/cond.c
index 713638c8..d605cdf6 100644
--- a/dmd/cond.c
+++ b/dmd/cond.c
@@ -130,7 +130,7 @@ void VersionCondition::checkPredefined(Loc loc, char *ident)
 	"DigitalMars", "LLVM", "LLVMDC", "LLVM64",
     "X86", "X86_64", "PPC", "PPC64",
 	"Windows", "Win32", "Win64",
-	"linux",
+	"linux", "darwin", "Posix",
 	"LittleEndian", "BigEndian",
 	"all",
 	"none",
diff --git a/gen/toir.cpp b/gen/toir.cpp
index 52dacfda..0b903df7 100644
--- a/gen/toir.cpp
+++ b/gen/toir.cpp
@@ -2156,12 +2156,20 @@ DValue* ArrayLiteralExp::toElem(IRState* p)
     Logger::cout() << (dyn?"dynamic":"static") << " array literal with length " << len << " of D type: '" << arrayType->toChars() << "' has llvm type: '" << *llType << "'\n";
 
     // llvm storage type
-    const LLType* llStoType = LLArrayType::get(DtoType(elemType), len);
+    const LLType* llElemType = DtoTypeNotVoid(elemType);
+    const LLType* llStoType = LLArrayType::get(llElemType, len);
     Logger::cout() << "llvm storage type: '" << *llStoType << "'\n";
 
+    // don't allocate storage for zero length dynamic array literals
+    if (dyn && len == 0)
+    {
+        // dmd seems to just make them null...
+        return new DSliceValue(type, DtoConstSize_t(0), getNullPtr(getPtrToType(llElemType)));
+    }
+
     // dst pointer
-    LLValue* dstMem = 0;
-    dstMem = DtoAlloca(llStoType, "arrayliteral");
+    // FIXME: dynamic array literals should be allocated with the GC
+    LLValue* dstMem = DtoAlloca(llStoType, "arrayliteral");
 
     // store elements
     for (size_t i=0; i<len; ++i)
diff --git a/tests/mini/arrays16.d b/tests/mini/arrays16.d
index dae18d1e..006819f6 100644
--- a/tests/mini/arrays16.d
+++ b/tests/mini/arrays16.d
@@ -1,4 +1,4 @@
-module tangotests.arrays2;
+module mini.arrays16;
 
 void main()
 {
diff --git a/tests/mini/arrays17.d b/tests/mini/arrays17.d
index de358a31..8e0870c5 100644
--- a/tests/mini/arrays17.d
+++ b/tests/mini/arrays17.d
@@ -1,4 +1,4 @@
-module tangotests.arrays3;
+module mini.arrays17;
 
 void main()
 {
diff --git a/tests/mini/arrays18.d b/tests/mini/arrays18.d
index a171bf13..e29d9ebb 100644
--- a/tests/mini/arrays18.d
+++ b/tests/mini/arrays18.d
@@ -1,4 +1,4 @@
-module tangotests.arrays4;
+module mini.arrays18;
 
 struct Str { int a,b; }
 void main() {
diff --git a/tests/mini/arrays19.d b/tests/mini/arrays19.d
new file mode 100644
index 00000000..299cd545
--- /dev/null
+++ b/tests/mini/arrays19.d
@@ -0,0 +1,9 @@
+module mini.arrays19;
+
+extern(C) int printf(char*, ...);
+
+void main()
+{
+  bool var = ([] is null);
+  assert(var);
+}
diff --git a/tests/mini/arrays20.d b/tests/mini/arrays20.d
new file mode 100644
index 00000000..4124500e
--- /dev/null
+++ b/tests/mini/arrays20.d
@@ -0,0 +1,23 @@
+module mini.arrays20;
+
+int[] foo()
+{
+    return [2,4,6];
+}
+
+int[] bar()
+{
+    return [1,3,5];
+}
+
+void main()
+{
+    auto a = foo();
+    auto b = bar();
+    assert(b[0] == 1);
+    assert(a[0] == 2);
+    assert(b[1] == 3);
+    assert(a[1] == 4);
+    assert(b[2] == 5);
+    assert(a[2] == 6);
+}
diff --git a/tests/mini/complex5.d b/tests/mini/complex5.d
new file mode 100644
index 00000000..f5e4de40
--- /dev/null
+++ b/tests/mini/complex5.d
@@ -0,0 +1,13 @@
+module complex5;
+
+void main()
+{
+    cfloat c = 3+2i;
+    foo(c);
+}
+
+void foo(cfloat c)
+{
+    assert(c.re > 2.9999  && c.re < 3.0001);
+    assert(c.im > 1.9999i && c.im < 2.0001);
+}