# HG changeset patch
# User Christian Kamm <kamm incasoftware de>
# Date 1242980284 -7200
# Node ID ecfec65d86cf4d57920dae504c89eee90513fd42
# Parent  9a049fd1a0145c8a329a252b5dc3a4cb60c0c233# Parent  afecdb8ee962d1c61c612e75d05843c5bef4d14c
Automated merge with http://hg.dsource.org/projects/ldc

diff -r 9a049fd1a014 -r ecfec65d86cf dmd/arrayop.c
--- a/dmd/arrayop.c	Fri May 22 00:19:54 2009 +0200
+++ b/dmd/arrayop.c	Fri May 22 10:18:04 2009 +0200
@@ -281,10 +281,10 @@
         // special attention for array ops
         fd->isArrayOp = true;
 
-        sc->module->members->push(fd);
+        sc->module->importedFrom->members->push(fd);
 
         sc = sc->push();
-        sc->parent = sc->module;
+        sc->parent = sc->module->importedFrom;
         sc->stc = 0;
         sc->linkage = LINKd;
         fd->semantic(sc);
diff -r 9a049fd1a014 -r ecfec65d86cf gen/llvmhelpers.cpp
--- a/gen/llvmhelpers.cpp	Fri May 22 00:19:54 2009 +0200
+++ b/gen/llvmhelpers.cpp	Fri May 22 10:18:04 2009 +0200
@@ -1369,13 +1369,13 @@
 {
     if (FuncDeclaration* fd = s->isFuncDeclaration())
     {
-        if (fd->isArrayOp)
-            return true;
-            
         // we can't (and probably shouldn't?) define functions 
         // that weren't semantic3'ed
         if (fd->semanticRun < 4)
             return false;
+
+	if (fd->isArrayOp)
+            return true;
     }
 
     TemplateInstance* tinst = DtoIsTemplateInstance(s);