Changeset 747:46d0755451a4

Timestamp:

11/01/08 13:25:10 (2 months ago)

Author:

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

branch:

default

Message:

Added DtoRawVarDeclaration? routine to handle special variables in some statements.

Files:

• gen/llvmhelpers.cpp (modified) (1 diff)
• gen/llvmhelpers.h (modified) (1 diff)
• gen/statements.cpp (modified) (4 diffs)

gen/llvmhelpers.cpp

@@ -1321 +1321 @@
-}
-
+// does pretty much the same as DtoDeclarationExp, except it doesn't initialize, and only handles var declarations
+LLValue* DtoRawVarDeclaration(VarDeclaration* var)
+{
+    // we don't handle globals with this one
+    assert(!var->isDataseg());
+
+    // we don't handle aliases either
+    assert(!var->aliassym);
+
+    // referenced by nested function?
+    if (var->nestedref)
+    {
+        assert(var->ir.irLocal);
+        assert(!var->ir.irLocal->value);
+
+        // alloca
+        var->ir.irLocal->value = DtoAlloca(DtoType(var->type), var->toChars());
+
+        // store the address into the nested vars array
+        assert(var->ir.irLocal->nestedIndex >= 0);
+        LLValue* gep = DtoGEPi(gIR->func()->decl->ir.irFunc->nestedVar, 0, var->ir.irLocal->nestedIndex);
+        assert(isaPointer(var->ir.irLocal->value));
+        LLValue* val = DtoBitCast(var->ir.irLocal->value, getVoidPtrType());
+        DtoStore(val, gep);
+    }
+    // normal local variable
+    else
+    {
+        assert(!var->ir.isSet());
+        var->ir.irLocal = new IrLocal(var);
+        var->ir.irLocal->value = DtoAlloca(DtoType(var->type), var->toChars());
+    }
+
+    // add debug info
+    if (global.params.symdebug)
+        DtoDwarfLocalVariable(var->ir.irLocal->value, var);
+
+    // return the alloca
+    return var->ir.irLocal->value;
+}
-
-/****************************************************************************************/

gen/llvmhelpers.h

@@ -84 +84 @@
-// declaration inside a declarationexp
-DValue* DtoDeclarationExp(Dsymbol* declaration);
+LLValue* DtoRawVarDeclaration(VarDeclaration* var);
-
-// initializer helpers

gen/statements.cpp

@@ -155 +155 @@
-
-    if (match)
-DeclarationExp
+RawVarDeclaration
-
-    DValue* cond_e = condition->toElem(p);
@@ -927 +927 @@
-    LLValue* keyvar;
-    if (key)
-
-
-
-
+
-    else
-        keyvar = DtoAlloca(keytype, "foreachkey");
@@ -937 +934 @@
-    // value
-    Logger::println("value = %s", value->toPrettyChars());
-DeclarationExp
+RawVarDeclaration
-    const LLType* valtype = DtoType(value->type);
-    LLValue* valvar = NULL;
@@ -1150 +1147 @@
-
-    DValue* e = exp->toElem(p);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-    body->toIR(p);