aboutsummaryrefslogtreecommitdiff
path: root/gcc/java
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/java')
-rw-r--r--gcc/java/ChangeLog6
-rw-r--r--gcc/java/parse.c1
-rw-r--r--gcc/java/parse.y1
-rw-r--r--gcc/java/typeck.c5
4 files changed, 12 insertions, 1 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index ca638d7..b19bc57 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,9 @@
+2000-06-13 Jakub Jelinek <jakub@redhat.com>
+
+ * typeck.c (build_java_array_type): Set TYPE_USER_ALIGN.
+ * parse.y (java_complete_class): Set DECL_USER_ALIGN.
+ * parse.c: Rebuilt.
+
2000-06-11 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* decl.c (create_primitive_vtable): Prototype.
diff --git a/gcc/java/parse.c b/gcc/java/parse.c
index fd547f2..22c5bf1 100644
--- a/gcc/java/parse.c
+++ b/gcc/java/parse.c
@@ -7949,6 +7949,7 @@ java_complete_class ()
pop_obstacks ();
TREE_TYPE (field_decl) = field_type;
DECL_ALIGN (field_decl) = 0;
+ DECL_USER_ALIGN (field_decl) = 0;
layout_decl (field_decl, 0);
SOURCE_FRONTEND_DEBUG
(("Completed field/var decl `%s' with `%s'",
diff --git a/gcc/java/parse.y b/gcc/java/parse.y
index e6b3537..6b13e0c 100644
--- a/gcc/java/parse.y
+++ b/gcc/java/parse.y
@@ -5249,6 +5249,7 @@ java_complete_class ()
pop_obstacks ();
TREE_TYPE (field_decl) = field_type;
DECL_ALIGN (field_decl) = 0;
+ DECL_USER_ALIGN (field_decl) = 0;
layout_decl (field_decl, 0);
SOURCE_FRONTEND_DEBUG
(("Completed field/var decl `%s' with `%s'",
diff --git a/gcc/java/typeck.c b/gcc/java/typeck.c
index 4309cfb..1a7256d 100644
--- a/gcc/java/typeck.c
+++ b/gcc/java/typeck.c
@@ -421,7 +421,10 @@ build_java_array_type (element_type, length)
TREE_CHAIN (fld) = arfld;
}
else
- TYPE_ALIGN (t) = TYPE_ALIGN (element_type);
+ {
+ TYPE_ALIGN (t) = TYPE_ALIGN (element_type);
+ TYPE_USER_ALIGN (t) = TYPE_USER_ALIGN (element_type);
+ }
pop_obstacks ();
/* We could layout_class, but that loads java.lang.Object prematurely.