aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/java/ChangeLog5
-rw-r--r--gcc/java/lang.c4
2 files changed, 9 insertions, 0 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 27a44f1..e6d8db3 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-23 Jeffrey A Law (law@cygnus.com)
+
+ * lang.c (java_init_options_struct): Disable optimizations
+ which assume a NULL pointer dereference will cause a fault.
+
2011-11-07 Richard Henderson <rth@redhat.com>
* builtins.c (compareAndSwapInt_builtin): Use can_compare_and_swap_p.
diff --git a/gcc/java/lang.c b/gcc/java/lang.c
index 6a117d7..ccab48c 100644
--- a/gcc/java/lang.c
+++ b/gcc/java/lang.c
@@ -556,6 +556,10 @@ java_init_options_struct (struct gcc_options *opts)
/* Java requires left-to-right evaluation of subexpressions. */
opts->x_flag_evaluation_order = 1;
+
+ /* Java catches NULL pointer exceptions, thus we can not necessarily
+ rely on a pointer having a non-NULL value after a dereference. */
+ opts->x_flag_delete_null_pointer_checks = 0;
}
static void