Changeset 739:1ae94fb1dbbd

Timestamp:

10/30/08 05:16:37 (2 months ago)

Author:

Christian Kamm <kamm incasoftware de>

branch:

default

Message:

Fix accidental double-inreg caused by shared TupleType?. Enabled inreg by default.

Files:

• dmd/mtype.c (modified) (1 diff)
• gen/functions.cpp (modified) (2 diffs)
• premake.lua (modified) (1 diff)

dmd/mtype.c

@@ -3455 +3455 @@
-    }
-    if (t->ty == Ttuple)
-
+->syntaxCopy()
-    else
-        *pt = t->merge();

gen/functions.cpp

@@ -204 +204 @@
-            // FIXME: struct are not passed in EAX yet
-
+            int n_inreg = f->reverseParams ? n - 1 : 0;
+            Argument* arg = Argument::getNth(f->parameters, n_inreg);
+
-            // if there is a implicit context parameter, pass it in EAX
-            if (usesthis || usesnest)
-            {
-                f->thisAttrs |= llvm::Attribute::InReg;
+                assert((!arg || (arg->llvmAttrs & llvm::Attribute::InReg) == 0) && "can't have two inreg args!");
-            }
-            // otherwise check the first formal parameter
-            else
-            {
-                int inreg = f->reverseParams ? n - 1 : 0;
-                Argument* arg = Argument::getNth(f->parameters, inreg);
-                Type* t = arg->type->toBasetype();
-
@@ -224 +226 @@
-                {
-                    arg->llvmAttrs |= llvm::Attribute::InReg;
+                    assert((f->thisAttrs & llvm::Attribute::InReg) == 0 && "can't have two inreg args!");
-                }
-            }

premake.lua

@@ -40 +40 @@
--- x86 ABI support
-X86_REVERSE_PARAMS = 1
-0 --disabled for now
+1
-
--- D version - don't change these !!!