diff options
| -rw-r--r-- | gcc/java/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/java/lang.c | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index c9336d3..5b1e588 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,9 @@ +2014-10-15 Evgeny Stupachenko <evstupac@gmail.com> + + PR target/63536 + * lang.c (java_print_error_function): Add check on NULL function + context. + 2014-10-12 Trevor Saunders <tsaunders@mozilla.com> * class.c, decl.c, except.c, expr.c, java-tree.h, lang.c: Use diff --git a/gcc/java/lang.c b/gcc/java/lang.c index 7f0b09d..b64e4ea 100644 --- a/gcc/java/lang.c +++ b/gcc/java/lang.c @@ -489,6 +489,7 @@ java_print_error_function (diagnostic_context *context ATTRIBUTE_UNUSED, return; if (current_function_decl != NULL + && DECL_CONTEXT (current_function_decl) != NULL && DECL_CONTEXT (current_function_decl) != last_error_function_context) { if (file) |