Convert symbols to expression type, fixes #115

D-Programming-GDC · Apr 15, 2014 · d1afed7 · d1afed7
1 parent dc22461
commit d1afed7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/gcc/d/ChangeLog b/gcc/d/ChangeLog
@@ -1,7 +1,9 @@
 2014-04-15  Johannes Pfau  <johannespfau@gmail.com>
 
-	* d-lang.cc(d_handle_noclone_attribute): New function, required for
-	naked attribute.
+	* d-lang.cc(d_handle_noclone_attribute): New function to handle
+	noclone attribute. noclone is required by the naked attribute.
+	* d-elem.cc(SymbolExp::toElem): Convert symbols to the expression
+	type.
 
 2014-04-13  Iain Buclaw  <ibuclaw@gdcproject.org>
 

diff --git a/gcc/d/d-elem.cc b/gcc/d/d-elem.cc
@@ -2022,6 +2022,12 @@ SymbolExp::toElem (IRState *irs)
       if (decl_reference_p (var))
 	exp = indirect_ref (var->type->toCtype(), exp);
 
+      // The frontend sometimes emits different types for the expression and var.
+      // Convert to the expressions type, but don't convert FuncDeclaration as
+      // type->toCtype sometimes isn't the correct type for functions!
+      if (!var->type->equals (type) && !var->isFuncDeclaration())
+	exp = build1 (VIEW_CONVERT_EXPR, type->toCtype(), exp);
+
       return exp;
     }
   else if (op == TOKsymoff)