Merge pull request #578 from ibuclaw/bug252

Fix Bug 252: ICE when compiling with -flto

Author: ibuclaw

gcc/d/ChangeLog

@@ -1,3 +1,10 @@
+2017-12-10  Iain Buclaw  <ibuclaw@gdcproject.org>
+
+	* d-codegen.cc (build_alignment_field): Set DECL_PADDING_P and
+	DECL_FIELD_CONTEXT on generated fields.
+	(build_struct_literal): Use build_zero_cst to generate padding.
+	* decl.cc (build_type_decl): Set public and decl assembler name.
+
 2017-12-10  Iain Buclaw  <ibuclaw@gdcproject.org>
 
 	* types.cc (TypeVisitor::visit(TypeClass)): Check for duplicate

gcc/d/d-codegen.cc

@@ -978,14 +978,16 @@ build_array_struct_comparison (tree_code code, StructDeclaration *sd,
    the alignment hole between OFFSET and FIELDPOS.  */
 
 static tree
-build_alignment_field (HOST_WIDE_INT offset, HOST_WIDE_INT fieldpos)
+build_alignment_field (tree type, HOST_WIDE_INT offset, HOST_WIDE_INT fieldpos)
 {
-  tree type = make_array_type (Type::tuns8, fieldpos - offset);
-  tree field = create_field_decl (type, NULL, 1, 1);
+  tree atype = make_array_type (Type::tuns8, fieldpos - offset);
+  tree field = create_field_decl (atype, NULL, 1, 1);
 
-  SET_DECL_OFFSET_ALIGN (field, TYPE_ALIGN (type));
+  SET_DECL_OFFSET_ALIGN (field, TYPE_ALIGN (atype));
   DECL_FIELD_OFFSET (field) = size_int (offset);
   DECL_FIELD_BIT_OFFSET (field) = bitsize_zero_node;
+  DECL_FIELD_CONTEXT (field) = type;
+  DECL_PADDING_P (field) = 1;
 
   layout_decl (field, 0);
 
@@ -1063,8 +1065,8 @@ build_struct_literal (tree type, vec<constructor_elt, va_gc> *init)
 	     alignment holes in-place between fields.  */
 	  if (fillholes && offset < fieldpos)
 	    {
-	      tree pfield = build_alignment_field (offset, fieldpos);
-	      tree pvalue = build_constructor (TREE_TYPE (pfield), NULL);
+	      tree pfield = build_alignment_field (type, offset, fieldpos);
+	      tree pvalue = build_zero_cst (TREE_TYPE (pfield));
 	      CONSTRUCTOR_APPEND_ELT (ve, pfield, pvalue);
 	    }
 
@@ -1113,8 +1115,9 @@ build_struct_literal (tree type, vec<constructor_elt, va_gc> *init)
   /* Finally pad out the end of the record.  */
   if (fillholes && offset < int_size_in_bytes (type))
     {
-      tree pfield = build_alignment_field (offset, int_size_in_bytes (type));
-      tree pvalue = build_constructor (TREE_TYPE (pfield), NULL);
+      tree pfield = build_alignment_field (type, offset,
+					   int_size_in_bytes (type));
+      tree pvalue = build_zero_cst (TREE_TYPE (pfield));
       CONSTRUCTOR_APPEND_ELT (ve, pfield, pvalue);
     }
 

gcc/d/decl.cc

@@ -2085,6 +2085,8 @@ build_type_decl (tree type, Dsymbol *dsym)
 
   tree decl = build_decl (get_linemap (dsym->loc), TYPE_DECL,
 			  get_identifier (dsym->ident->toChars ()), type);
+  SET_DECL_ASSEMBLER_NAME (decl, get_identifier (mangle_decl (dsym)));
+  TREE_PUBLIC (decl) = 1;
   DECL_ARTIFICIAL (decl) = 1;
   DECL_CONTEXT (decl) = d_decl_context (dsym);
 

gcc/testsuite/gdc.dg/lto/ltotests_0.d

@@ -5,7 +5,6 @@ import core.stdc.stdio;
 
 /******************************************/
 
-/+ XBUG: lto1: internal compiler error: in get_odr_type
 interface I284
 {
    void m284();
@@ -15,17 +14,14 @@ class C284 : I284
 {
    void m284() { }
 }
-+/
 
 /******************************************/
 
-/+ XBUG: lto1: internal compiler error: in get_odr_type
 class C304
 {
 }
 
 C304 c304;
-+/
 
 /******************************************/
 
@@ -68,9 +64,29 @@ void test88()
 
 /******************************************/
 
+// Bug 252
+
+class C252
+{
+    struct S252
+    {
+        int i;
+        ubyte u;
+    }
+    S252 s;
+}
+
+void test252()
+{
+    C252 c = new C252();
+}
+
+/******************************************/
+
 void main(string[])
 {
     test88();
+    test252();
 
     printf("Success!\n");
 }