From: Kazu Hirata Date: Mon, 4 Apr 2005 15:29:52 +0000 (+0000) Subject: gcj.texi: Fix a typo. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=df04438806922874ac6372c4f3e990a9fc7dfd90;p=gcc.git gcj.texi: Fix a typo. * gcj.texi: Fix a typo. * lang.c: Fix a comment typo. From-SVN: r97551 --- diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index e45415e10aa..6d4d4bfa314 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,8 @@ +2005-04-04 Kazu Hirata + + * gcj.texi: Fix a typo. + * lang.c: Fix a comment typo. + 2005-04-01 Thomas Fitzsimmons * gcj.texi (Invoking gij): Add descriptions of new -X options. diff --git a/gcc/java/gcj.texi b/gcc/java/gcj.texi index e71511af770..523a0b59b02 100644 --- a/gcc/java/gcj.texi +++ b/gcc/java/gcj.texi @@ -1653,7 +1653,7 @@ java::util::Hashtable *ht = new java::util::Hashtable(120); @node Memory allocation @section Memory allocation -When allocting memory in @acronym{CNI} methods it is best to handle +When allocating memory in @acronym{CNI} methods it is best to handle out-of-memory conditions by throwing a Java exception. These functions are provided for that purpose: diff --git a/gcc/java/lang.c b/gcc/java/lang.c index 553e20cf57f..e0d2672b2a5 100644 --- a/gcc/java/lang.c +++ b/gcc/java/lang.c @@ -801,7 +801,7 @@ merge_init_test_initialization (void **entry, void *x) does this by setting the DECL_INITIAL of the init_test_decl for that class, and no initializations are emitted for that class. - However, what if the method that is suppoed to do the initialization + However, what if the method that is supposed to do the initialization is itself inlined in the caller? When expanding the called method we'll assume that the class initialization has already been done, because the DECL_INITIAL of the init_test_decl is set.