From 4b943588d131d6fa709b89903c920b726a85df82 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 12 Sep 2006 15:55:07 +0000 Subject: [PATCH] re PR java/28754 (java.lang.nullPointerException while accessing final static members of an interface) PR java/28754: * expr.c (expand_java_field_op): Initialize field's declaring interface if necessary. From-SVN: r116890 --- gcc/java/ChangeLog | 6 ++++++ gcc/java/expr.c | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index e7508bfbb7b..1df29ccb838 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,9 @@ +2006-09-12 Tom Tromey + + PR java/28754: + * expr.c (expand_java_field_op): Initialize field's declaring + interface if necessary. + 2006-09-12 Tom Tromey PR java/28892: diff --git a/gcc/java/expr.c b/gcc/java/expr.c index b08d33e9ada..26cd7da5078 100644 --- a/gcc/java/expr.c +++ b/gcc/java/expr.c @@ -2837,7 +2837,12 @@ expand_java_field_op (int is_static, int is_putting, int field_ref_index) field_ref = build_field_ref (field_ref, self_type, field_name); if (is_static && ! flag_indirect_dispatch) - field_ref = build_class_init (self_type, field_ref); + { + tree context = DECL_CONTEXT (field_ref); + if (context != self_type && CLASS_INTERFACE (TYPE_NAME (context))) + field_ref = build_class_init (context, field_ref); + field_ref = build_class_init (self_type, field_ref); + } if (is_putting) { flush_quick_stack (); -- 2.30.2