ortho/gcc, ortho/llvm: do not allocate space for unbounded fields. Fix #1764

6 files changed, 66 insertions, 0 deletions

diff --git a/src/ortho/gcc/ortho-lang-49.c b/src/ortho/gcc/ortho-lang-49.c
index d2c3dfc52..e8b4f5643 100644
--- a/src/ortho/gcc/ortho-lang-49.c
+++ b/src/ortho/gcc/ortho-lang-49.c
@@ -50,6 +50,8 @@
 #include "stor-layout.h"
 #include "varasm.h"
 
+#define TYPE_UNBOUNDED(t) TYPE_LANG_FLAG_0(t)
+
 /* Returns the number of FIELD_DECLs in TYPE.
    Copied here from expr.c in gcc4.9 as it is no longer exported by tree.h.  */
 
@@ -1139,6 +1141,13 @@ new_record_union_field (struct o_element_list *list,
 {
   tree res;
 
+  if (TYPE_UNBOUNDED(etype)) {
+    /* If the field type is unbounded, it mustn't use any space in the
+       record.  Use VOID instead.  */
+    TYPE_UNBOUNDED(list->res) = 1;
+    etype = void_type_node;
+  }
+
   res = build_decl (input_location, FIELD_DECL, ident, etype);
   DECL_CONTEXT (res) = list->res;
   chain_append (&list->chain, res);
@@ -1303,6 +1312,7 @@ new_array_type (tree el_type, tree index_type)
   /* Build an incomplete array.  */
   range_type = build_range_type (index_type, size_zero_node, NULL_TREE);
   res = build_array_type (el_type, range_type);
+  TYPE_UNBOUNDED(res) = 1;
   return res;
 }
 
@@ -1313,6 +1323,7 @@ new_array_subtype (tree atype, tree eltype, tree length)
   tree index_type;
   tree res;
 
+  gcc_assert(!TYPE_UNBOUNDED(eltype));
   index_type = TYPE_DOMAIN (atype);
 
   range_type = ortho_build_array_range(index_type, length);
diff --git a/src/ortho/gcc/ortho-lang-5.c b/src/ortho/gcc/ortho-lang-5.c
index 8daa5dd92..6a3d5cdb8 100644
--- a/src/ortho/gcc/ortho-lang-5.c
+++ b/src/ortho/gcc/ortho-lang-5.c
@@ -66,6 +66,8 @@
 #include "stor-layout.h"
 #include "varasm.h"
 
+#define TYPE_UNBOUNDED(t) TYPE_LANG_FLAG_0(t)
+
 /* Returns the number of FIELD_DECLs in TYPE.
    Copied here from expr.c in gcc4.9 as it is no longer exported by tree.h.  */
 
@@ -1125,6 +1127,13 @@ new_record_union_field (struct o_element_list *list,
 {
   tree res;
 
+  if (TYPE_UNBOUNDED(etype)) {
+    /* If the field type is unbounded, it mustn't use any space in the
+       record.  Use VOID instead.  */
+    TYPE_UNBOUNDED(list->res) = 1;
+    etype = void_type_node;
+  }
+
   res = build_decl (input_location, FIELD_DECL, ident, etype);
   DECL_CONTEXT (res) = list->res;
   chain_append (&list->chain, res);
@@ -1289,6 +1298,7 @@ new_array_type (tree el_type, tree index_type)
   /* Build an incomplete array.  */
   range_type = build_range_type (index_type, size_zero_node, NULL_TREE);
   res = build_array_type (el_type, range_type);
+  TYPE_UNBOUNDED(res) = 1;
   return res;
 }
 
@@ -1299,6 +1309,7 @@ new_array_subtype (tree atype, tree eltype, tree length)
   tree index_type;
   tree res;
 
+  gcc_assert(!TYPE_UNBOUNDED(eltype));
   index_type = TYPE_DOMAIN (atype);
 
   range_type = ortho_build_array_range(index_type, length);
diff --git a/src/ortho/gcc/ortho-lang-6.c b/src/ortho/gcc/ortho-lang-6.c
index 244b26c6c..d2f15cc51 100644
--- a/src/ortho/gcc/ortho-lang-6.c
+++ b/src/ortho/gcc/ortho-lang-6.c
@@ -66,6 +66,8 @@
 #include "stor-layout.h"
 #include "varasm.h"
 
+#define TYPE_UNBOUNDED(t) TYPE_LANG_FLAG_0(t)
+
 /* Returns the number of FIELD_DECLs in TYPE.
    Copied here from expr.c in gcc4.9 as it is no longer exported by tree.h.  */
 
@@ -1125,6 +1127,13 @@ new_record_union_field (struct o_element_list *list,
 {
   tree res;
 
+  if (TYPE_UNBOUNDED(etype)) {
+    /* If the field type is unbounded, it mustn't use any space in the
+       record.  Use VOID instead.  */
+    TYPE_UNBOUNDED(list->res) = 1;
+    etype = void_type_node;
+  }
+
   res = build_decl (input_location, FIELD_DECL, ident, etype);
   DECL_CONTEXT (res) = list->res;
   chain_append (&list->chain, res);
@@ -1289,6 +1298,7 @@ new_array_type (tree el_type, tree index_type)
   /* Build an incomplete array.  */
   range_type = build_range_type (index_type, size_zero_node, NULL_TREE);
   res = build_array_type (el_type, range_type);
+  TYPE_UNBOUNDED(res) = 1;
   return res;
 }
 
@@ -1299,6 +1309,7 @@ new_array_subtype (tree atype, tree eltype, tree length)
   tree index_type;
   tree res;
 
+  gcc_assert(!TYPE_UNBOUNDED(eltype));
   index_type = TYPE_DOMAIN (atype);
 
   range_type = ortho_build_array_range(index_type, length);
diff --git a/src/ortho/gcc/ortho-lang-7.c b/src/ortho/gcc/ortho-lang-7.c
index a5b97d8c6..4600fc602 100644
--- a/src/ortho/gcc/ortho-lang-7.c
+++ b/src/ortho/gcc/ortho-lang-7.c
@@ -66,6 +66,8 @@
 #include "stor-layout.h"
 #include "varasm.h"
 
+#define TYPE_UNBOUNDED(t) TYPE_LANG_FLAG_0(t)
+
 /* Returns the number of FIELD_DECLs in TYPE.
    Copied here from expr.c in gcc4.9 as it is no longer exported by tree.h.  */
 
@@ -1137,6 +1139,13 @@ new_record_union_field (struct o_element_list *list,
 {
   tree res;
 
+  if (TYPE_UNBOUNDED(etype)) {
+    /* If the field type is unbounded, it mustn't use any space in the
+       record.  Use VOID instead.  */
+    TYPE_UNBOUNDED(list->res) = 1;
+    etype = void_type_node;
+  }
+
   res = build_decl (input_location, FIELD_DECL, ident, etype);
   DECL_CONTEXT (res) = list->res;
   chain_append (&list->chain, res);
@@ -1301,6 +1310,7 @@ new_array_type (tree el_type, tree index_type)
   /* Build an incomplete array.  */
   range_type = build_range_type (index_type, size_zero_node, NULL_TREE);
   res = build_array_type (el_type, range_type);
+  TYPE_UNBOUNDED(res) = 1;
   return res;
 }
 
@@ -1311,6 +1321,7 @@ new_array_subtype (tree atype, tree eltype, tree length)
   tree index_type;
   tree res;
 
+  gcc_assert(!TYPE_UNBOUNDED(eltype));
   index_type = TYPE_DOMAIN (atype);
 
   range_type = ortho_build_array_range(index_type, length);
diff --git a/src/ortho/gcc/ortho-lang-8.c b/src/ortho/gcc/ortho-lang-8.c
index 2c37bdbf5..f88cea0c1 100644
--- a/src/ortho/gcc/ortho-lang-8.c
+++ b/src/ortho/gcc/ortho-lang-8.c
@@ -66,6 +66,8 @@
 #include "stor-layout.h"
 #include "varasm.h"
 
+#define TYPE_UNBOUNDED(t) TYPE_LANG_FLAG_0(t)
+
 /* Returns the number of FIELD_DECLs in TYPE.
    Copied here from expr.c in gcc4.9 as it is no longer exported by tree.h.  */
 
@@ -1138,6 +1140,13 @@ new_record_union_field (struct o_element_list *list,
 {
   tree res;
 
+  if (TYPE_UNBOUNDED(etype)) {
+    /* If the field type is unbounded, it mustn't use any space in the
+       record.  Use VOID instead.  */
+    TYPE_UNBOUNDED(list->res) = 1;
+    etype = void_type_node;
+  }
+
   res = build_decl (input_location, FIELD_DECL, ident, etype);
   DECL_CONTEXT (res) = list->res;
   chain_append (&list->chain, res);
@@ -1302,6 +1311,7 @@ new_array_type (tree el_type, tree index_type)
   /* Build an incomplete array.  */
   range_type = build_range_type (index_type, size_zero_node, NULL_TREE);
   res = build_array_type (el_type, range_type);
+  TYPE_UNBOUNDED(res) = 1;
   return res;
 }
 
@@ -1312,6 +1322,7 @@ new_array_subtype (tree atype, tree eltype, tree length)
   tree index_type;
   tree res;
 
+  gcc_assert(!TYPE_UNBOUNDED(eltype));
   index_type = TYPE_DOMAIN (atype);
 
   range_type = ortho_build_array_range(index_type, length);
diff --git a/src/ortho/gcc/ortho-lang-9.c b/src/ortho/gcc/ortho-lang-9.c
index 66e7d7ab0..b7dfab4f3 100644
--- a/src/ortho/gcc/ortho-lang-9.c
+++ b/src/ortho/gcc/ortho-lang-9.c
@@ -66,6 +66,8 @@
 #include "stor-layout.h"
 #include "varasm.h"
 
+#define TYPE_UNBOUNDED(t) TYPE_LANG_FLAG_0(t)
+
 /* Returns the number of FIELD_DECLs in TYPE.
    Copied here from expr.c in gcc4.9 as it is no longer exported by tree.h.  */
 
@@ -1138,6 +1140,13 @@ new_record_union_field (struct o_element_list *list,
 {
   tree res;
 
+  if (TYPE_UNBOUNDED(etype)) {
+    /* If the field type is unbounded, it mustn't use any space in the
+       record.  Use VOID instead.  */
+    TYPE_UNBOUNDED(list->res) = 1;
+    etype = void_type_node;
+  }
+
   res = build_decl (input_location, FIELD_DECL, ident, etype);
   DECL_CONTEXT (res) = list->res;
   chain_append (&list->chain, res);
@@ -1302,6 +1311,7 @@ new_array_type (tree el_type, tree index_type)
   /* Build an incomplete array.  */
   range_type = build_range_type (index_type, size_zero_node, NULL_TREE);
   res = build_array_type (el_type, range_type);
+  TYPE_UNBOUNDED(res) = 1;
   return res;
 }
 
@@ -1312,6 +1322,7 @@ new_array_subtype (tree atype, tree eltype, tree length)
   tree index_type;
   tree res;
 
+  gcc_assert(!TYPE_UNBOUNDED(eltype));
   index_type = TYPE_DOMAIN (atype);
 
   range_type = ortho_build_array_range(index_type, length);