diff options
| author | law <law@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-11-30 05:16:36 +0000 |
|---|---|---|
| committer | law <law@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-11-30 05:16:36 +0000 |
| commit | bc4381667a31bd5f1e677d64c789b1e959df00d5 (patch) | |
| tree | a6b80dca8f72a2e7640e4d535901e42325b2a954 /gcc/java | |
| parent | 1cd66bce1663eb648638d311b493de0dcc4146c3 (diff) | |
| parent | 738c50b853f5ba0eaf93e23f6d29cbac761eef9e (diff) | |
| download | gcc-reload-v2a.tar.gz | |
Weekly merge from trunk. No regressions.reload-v2a
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/reload-v2a@181834 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/java/lang.c | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 27a44f11f7d..e6d8db3a886 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 6a117d79fcc..ccab48c4e7a 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 |