Changeset 1279:04c36605feb9

Timestamp:

04/29/09 12:59:39 (3 years ago)

Author:

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

branch:

default

Message:

Fixed array operation codegen when used from imported templates. All array operations are now emitted with template linkage. Fixed #270 .

Files:

• dmd/arrayop.c (modified) (1 diff)
• gen/llvmhelpers.cpp (modified) (1 diff)
• gen/tollvm.cpp (modified) (1 diff)

dmd/arrayop.c

@@ -276 +276 @@
-        fd = new FuncDeclaration(0, 0, Lexer::idPool(name), STCundefined, ftype);
-        fd->fbody = fbody;
-rotected
+ublic
-        fd->linkage = LINKd;
-

gen/llvmhelpers.cpp

@@ -1353 +1353 @@
-bool mustDefineSymbol(Dsymbol* s)
-{
+    if (FuncDeclaration* fd = s->isFuncDeclaration())
+    {
+        if (fd->isArrayOp)
+            return true;
+    }
+
-    TemplateInstance* tinst = DtoIsTemplateInstance(s);
-    if (tinst)

gen/tollvm.cpp

@@ -276 +276 @@
-        TypeFunction* ft = (TypeFunction*)fdecl->type;
-
-internal
+template linkage
-        if (fdecl->isArrayOp)
-llvm::GlobalValue::InternalLinkage
+TEMPLATE_LINKAGE_TYPE
-        // intrinsics are always external
-        if (fdecl->llvmInternal == LLVMintrinsic)