Merge pull request #4829 from 9rnsr/fix14814

[REG2.068a] Issue 14814 - ld: GOT load reloc does not point to a movq instruction
dlang · Jul 25, 2015 · 3a8dc47 · 3a8dc47
2 parents 35d35f1 + afc3ace
commit 3a8dc47
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 0 deletions.
diff --git a/src/e2ir.c b/src/e2ir.c
@@ -1129,6 +1129,7 @@ elem *toElem(Expression *e, IRState *irs)
             if (Type *t = isType(e->obj))
             {
                 result = getTypeInfo(t, irs);
+                result = el_bin(OPadd, result->Ety, result, el_long(TYsize_t, t->vtinfo->offset));
                 return;
             }
             if (Expression *ex = isExpression(e->obj))

diff --git a/test/runnable/imports/link14814a.d b/test/runnable/imports/link14814a.d
@@ -0,0 +1,11 @@
+module imports.link14814a;
+
+void fun0()
+{
+}
+
+void fun4()
+{
+    void function()[TypeInfo] funs;
+    funs[typeid(int)] = &fun0;
+}
diff --git a/test/runnable/link14814.d b/test/runnable/link14814.d
@@ -0,0 +1,10 @@
+// EXTRA_SOURCES: imports/link14814a.d
+// PERMUTE_ARGS: -inline -release -g -O -fPIC
+// COMPILE_SEPARATELY
+
+import imports.link14814a;
+
+void main()
+{
+    fun4;
+}