revert unintended change to gcc-def.exp.

[pf3gnuchains/gcc-fork.git] / libobjc / sarray.c

diff --git a/libobjc/sarray.c b/libobjc/sarray.c
index e78e36d..9dd160e 100644 (file)
--- a/libobjc/sarray.c
+++ b/libobjc/sarray.c
@@ -1,33 +1,35 @@
 /* Sparse Arrays for Objective C dispatch tables
-   Copyright (C) 1993, 1995, 1996, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1995, 1996, 2002, 2004, 2009 Free Software Foundation, Inc.
 
-This file is part of GNU CC.
+This file is part of GCC.
 
-GNU CC is free software; you can redistribute it and/or modify
+GCC is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
-GNU CC is distributed in the hope that it will be useful,
+GCC is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+Under Section 7 of GPL version 3, you are granted additional
+permissions described in the GCC Runtime Library Exception, version
+3.1, as published by the Free Software Foundation.
 
-/* As a special exception, if you link this library with files
-   compiled with GCC to produce an executable, this does not cause
-   the resulting executable to be covered by the GNU General Public License.
-   This exception does not however invalidate any other reasons why
-   the executable file might be covered by the GNU General Public License.  */
+You should have received a copy of the GNU General Public License and
+a copy of the GCC Runtime Library Exception along with this program;
+see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+<http://www.gnu.org/licenses/>.  */
 
-#include "sarray.h"
-#include "runtime.h"
+#include "objc-private/common.h"
+#include "objc-private/sarray.h"
+#include "objc/runtime.h" /* For objc_malloc */
+#include "objc/thr.h"     /* For objc_mutex_lock */
+#include "objc-private/runtime.h"
 #include <stdio.h>
-#include "assert.h"
+#include <string.h> /* For memset */
+#include <assert.h> /* For assert */
 
 int nbuckets = 0;                                      /* !T:MUTEX */
 int nindices = 0;                                      /* !T:MUTEX */
@@ -402,9 +404,6 @@ sarray_free (struct sarray *array) {
 #else
   old_buckets = array->buckets;
 #endif
-  
-  if ((array->is_copy_of) && ((array->is_copy_of->ref_count - 1) == 0))
-    sarray_free (array->is_copy_of);
 
   /* Free all entries that do not point to empty_bucket */
   for (counter = 0; counter <= old_max_index; counter++ ) {
@@ -426,7 +425,7 @@ sarray_free (struct sarray *array) {
       nindices -= 1;
     }
 #else /* OBJC_SPARSE2 */
-    struct sbucket *bkt = array->buckets[counter];
+    struct sbucket *bkt = old_buckets[counter];
     if ((bkt != array->empty_bucket) &&
        (bkt->version.version == array->version.version))
       {
@@ -462,6 +461,12 @@ sarray_free (struct sarray *array) {
 
 #endif
   
+  /* If this is a copy of another array, we free it (which might just
+   * decrement its reference count so it will be freed when no longer in use).
+   */
+  if (array->is_copy_of)
+    sarray_free (array->is_copy_of);
+
   /* free array */
   sarray_free_garbage (array);
 }