Changeset 938:a904cc9bc064

Timestamp:

02/04/09 12:39:33 (3 years ago)

Author:

Christian Kamm <kamm incasoftware de>

branch:

default

Message:

Convert struct arg to integer when passing inreg to make sure LLVM doesn't
ignore the attribute!

Files:

• dmd/mtype.c (modified) (1 diff)
• dmd/mtype.h (modified) (2 diffs)
• gen/functions.cpp (modified) (3 diffs)
• gen/tocall.cpp (modified) (1 diff)

dmd/mtype.c

@@ -2692 +2692 @@
-    this->usesThis = false;
-    this->usesNest = false;
-false
+NULL
-    this->retAttrs = 0;
-    this->thisAttrs = 0;

dmd/mtype.h

@@ -24 +24 @@
-// llvm
-#include "../ir/irtype.h"
+namespace llvm { class Type; }
-
-struct Scope;
@@ -439 +440 @@
-    bool usesThis;
-    bool usesNest;
-
+
+
-    unsigned retAttrs;
-    unsigned thisAttrs; // also used for nest

gen/functions.cpp

@@ -221 +221 @@
-                    assert((f->thisAttrs & llvm::Attribute::InReg) == 0 && "can't have two inreg args!");
-
-{...}
+i8/i16/i32
-                    if ((arg->storageClass & STCin) && t->ty == Tstruct)
-                    {
@@ -227 +227 @@
-                        assert(isaPointer(paramvec[n_param]) && (arg->llvmAttrs & llvm::Attribute::ByVal)
-                            && "struct parameter expected to be {...}* byval before inreg is applied");
-
+
+
-                        arg->llvmAttrs &= ~llvm::Attribute::ByVal;
-                        f->structInregArg = true;
-                    }
-                }
@@ -760 +760 @@
-            {
-                int n_param = f->reverseParams ? f->firstRealArg + n - 1 - i : f->firstRealArg + i;
-
+
+
+
-                    && "Preconditions for inreg struct arg not met!");
-
-
-
+
+
+
-                irloc->value = mem;
-            }

gen/tocall.cpp

@@ -371 +371 @@
-            LLValue* arg = argval->getRVal();
-
+            int j = tf->reverseParams ? beg + n - i - 1 : beg + i;
+
-            // if it's a struct inreg arg, load first to pass as first-class value
-            if (tf->structInregArg && i == (tf->reverseParams ? n - 1 : 0))
-            {
-
+
+
-                arg = DtoLoad(arg);
-            }
-
-            int j = tf->reverseParams ? beg + n - i - 1 : beg + i;
-
-            // parameter type mismatch, this is hard to get rid of