Merge from trunk revision aa8f4242efc99f24de73c59d53996f28db28c13f.

19 files changed, 50 insertions, 34 deletions

diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog
index 01720f7..8e9f676 100644
--- a/gcc/objc/ChangeLog
+++ b/gcc/objc/ChangeLog
@@ -1,3 +1,21 @@
+2023-02-16  Patrick Palka  <ppalka@redhat.com>
+
+	* objc-act.h: Mechanically drop static from static inline
+	functions via s/^static inline/inline/g.
+	* objc-map.h: Likewise.
+	* objc-act.cc: Remove the redundant redeclarations of is_ivar
+	and lookup_category.
+
+2022-10-28  Joseph Myers  <joseph@codesourcery.com>
+
+	* objc-next-runtime-abi-01.cc (build_next_objc_exception_stuff):
+	Use build_function_type to build type of objc_setjmp_decl.
+
+2022-10-07  Martin Liska  <mliska@suse.cz>
+
+	* objc-gnu-runtime-abi-01.cc (generate_static_references):
+	Remove unused variable.
+
 2022-06-02  David Malcolm  <dmalcolm@redhat.com>
 
 	* objc-act.h (objc_get_sarif_source_language): New decl.
@@ -4246,7 +4264,7 @@
 	Move to c-objc-common.h.
 
 
-Copyright (C) 2004-2022 Free Software Foundation, Inc.
+Copyright (C) 2004-2023 Free Software Foundation, Inc.
 
 Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
diff --git a/gcc/objc/Make-lang.in b/gcc/objc/Make-lang.in
index b2ebd86..0a3d75a 100644
--- a/gcc/objc/Make-lang.in
+++ b/gcc/objc/Make-lang.in
@@ -1,5 +1,5 @@
 # Top level -*- makefile -*- fragment for GNU Objective-C
-#   Copyright (C) 1997-2022 Free Software Foundation, Inc.
+#   Copyright (C) 1997-2023 Free Software Foundation, Inc.
 
 #This file is part of GCC.
 
diff --git a/gcc/objc/config-lang.in b/gcc/objc/config-lang.in
index 8cf3524..6ee68bb 100644
--- a/gcc/objc/config-lang.in
+++ b/gcc/objc/config-lang.in
@@ -1,5 +1,5 @@
 # Top level configure fragment for GNU Objective-C
-#   Copyright (C) 1997-2022 Free Software Foundation, Inc.
+#   Copyright (C) 1997-2023 Free Software Foundation, Inc.
 
 #This file is part of GCC.
 
diff --git a/gcc/objc/lang-specs.h b/gcc/objc/lang-specs.h
index 049166c..3c88ddc 100644
--- a/gcc/objc/lang-specs.h
+++ b/gcc/objc/lang-specs.h
@@ -1,5 +1,5 @@
 /* Definitions for specs for Objective-C.
-   Copyright (C) 1998-2022 Free Software Foundation, Inc.
+   Copyright (C) 1998-2023 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
diff --git a/gcc/objc/objc-act.cc b/gcc/objc/objc-act.cc
index 10591bb..0820174 100644
--- a/gcc/objc/objc-act.cc
+++ b/gcc/objc/objc-act.cc
@@ -1,5 +1,5 @@
 /* Implement classes and message passing for Objective C.
-   Copyright (C) 1992-2022 Free Software Foundation, Inc.
+   Copyright (C) 1992-2023 Free Software Foundation, Inc.
    Contributed by Steve Naroff.
 
 This file is part of GCC.
@@ -117,7 +117,6 @@ static tree build_method_decl (enum tree_code, tree, tree, tree, bool);
 static tree objc_add_method (tree, tree, int, bool);
 static tree add_instance_variable (tree, objc_ivar_visibility_kind, tree);
 static tree build_ivar_reference (tree);
-static tree is_ivar (tree, tree);
 
 /* We only need the following for ObjC; ObjC++ will use C++'s definition
    of DERIVED_FROM_P.  */
@@ -169,7 +168,6 @@ static tree lookup_method_static (tree, tree, int);
 static void interface_hash_init (void);
 static tree add_interface (tree, tree);
 static void add_category (tree, tree);
-static inline tree lookup_category (tree, tree);
 
 /* Protocols.  */
 
diff --git a/gcc/objc/objc-act.h b/gcc/objc/objc-act.h
index 4f9c3a2..e21ab52 100644
--- a/gcc/objc/objc-act.h
+++ b/gcc/objc/objc-act.h
@@ -1,5 +1,5 @@
 /* Declarations for objc-act.cc.
-   Copyright (C) 1990-2022 Free Software Foundation, Inc.
+   Copyright (C) 1990-2023 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -745,7 +745,7 @@ size_t objc_common_tree_size (enum tree_code code);
 #define objc_is_class_id(TYPE) (OBJC_TYPE_NAME (TYPE) == objc_class_id)
 
 /* Retrieve category interface CAT_NAME (if any) associated with CLASS.  */
-static inline tree
+inline tree
 lookup_category (tree klass, tree cat_name)
 {
   tree category = CLASS_CATEGORY_LIST (klass);
@@ -756,7 +756,7 @@ lookup_category (tree klass, tree cat_name)
 }
 
 /* Count only the fields occurring in T.  */
-static inline int
+inline int
 ivar_list_length (tree t)
 {
   int count = 0;
@@ -768,7 +768,7 @@ ivar_list_length (tree t)
   return count;
 }
 
-static inline tree
+inline tree
 is_ivar (tree decl_chain, tree ident)
 {
   for ( ; decl_chain; decl_chain = DECL_CHAIN (decl_chain))
diff --git a/gcc/objc/objc-encoding.cc b/gcc/objc/objc-encoding.cc
index 9abc6b0..9edd624 100644
--- a/gcc/objc/objc-encoding.cc
+++ b/gcc/objc/objc-encoding.cc
@@ -1,5 +1,5 @@
 /* Routines dealing with ObjC encoding of types
-   Copyright (C) 1992-2022 Free Software Foundation, Inc.
+   Copyright (C) 1992-2023 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
diff --git a/gcc/objc/objc-encoding.h b/gcc/objc/objc-encoding.h
index 38ee951..b9c2924 100644
--- a/gcc/objc/objc-encoding.h
+++ b/gcc/objc/objc-encoding.h
@@ -1,5 +1,5 @@
 /* Routines dealing with ObjC encoding of types
-   Copyright (C) 1992-2022 Free Software Foundation, Inc.
+   Copyright (C) 1992-2023 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
diff --git a/gcc/objc/objc-gnu-runtime-abi-01.cc b/gcc/objc/objc-gnu-runtime-abi-01.cc
index 9413314..fbf8307 100644
--- a/gcc/objc/objc-gnu-runtime-abi-01.cc
+++ b/gcc/objc/objc-gnu-runtime-abi-01.cc
@@ -1,5 +1,5 @@
 /* GNU Runtime ABI version 8
-   Copyright (C) 2011-2022 Free Software Foundation, Inc.
+   Copyright (C) 2011-2023 Free Software Foundation, Inc.
    Contributed by Iain Sandoe (split from objc-act.cc)
 
 This file is part of GCC.
@@ -1852,7 +1852,7 @@ generate_static_references (void)
   tree class_name, klass, decl;
   tree cl_chain, in_chain, type
     = build_array_type (build_pointer_type (void_type_node), NULL_TREE);
-  int num_inst, num_class;
+  int num_class;
   char buf[BUFSIZE];
   vec<constructor_elt, va_gc> *decls = NULL;
 
@@ -1861,8 +1861,8 @@ generate_static_references (void)
     {
       vec<constructor_elt, va_gc> *v = NULL;
 
-      for (num_inst = 0, in_chain = TREE_PURPOSE (cl_chain);
-	   in_chain; num_inst++, in_chain = TREE_CHAIN (in_chain));
+      for (in_chain = TREE_PURPOSE (cl_chain);
+	   in_chain; in_chain = TREE_CHAIN (in_chain));
 
       snprintf (buf, BUFSIZE, "_OBJC_STATIC_INSTANCES_%d", num_class);
       decl = start_var_decl (type, buf);
diff --git a/gcc/objc/objc-lang.cc b/gcc/objc/objc-lang.cc
index 559de4b..89b3be4 100644
--- a/gcc/objc/objc-lang.cc
+++ b/gcc/objc/objc-lang.cc
@@ -1,5 +1,5 @@
 /* Language-dependent hooks for Objective-C.
-   Copyright (C) 2001-2022 Free Software Foundation, Inc.
+   Copyright (C) 2001-2023 Free Software Foundation, Inc.
    Contributed by Ziemowit Laski  <zlaski@apple.com>
 
 This file is part of GCC.
diff --git a/gcc/objc/objc-map.cc b/gcc/objc/objc-map.cc
index 963a558..9c81f9e 100644
--- a/gcc/objc/objc-map.cc
+++ b/gcc/objc/objc-map.cc
@@ -1,5 +1,5 @@
 /* objc-map.cc -- Implementation of map data structures for ObjC compiler
-   Copyright (C) 2011-2022 Free Software Foundation, Inc.
+   Copyright (C) 2011-2023 Free Software Foundation, Inc.
    Written by Nicola Pero <nicola.pero@meta-innovation.com>
 
 This program is free software; you can redistribute it and/or modify it
diff --git a/gcc/objc/objc-map.h b/gcc/objc/objc-map.h
index efcf04f..1e1b5fd 100644
--- a/gcc/objc/objc-map.h
+++ b/gcc/objc/objc-map.h
@@ -1,5 +1,5 @@
 /* objc-map.h -- Implementation of map data structures for ObjC compiler
-   Copyright (C) 2011-2022 Free Software Foundation, Inc.
+   Copyright (C) 2011-2023 Free Software Foundation, Inc.
    Written by Nicola Pero <nicola.pero@meta-innovation.com>
 
 This program is free software; you can redistribute it and/or modify it
@@ -133,7 +133,7 @@ int objc_map_maximum_load_factor (objc_map_t map);
    value NULL, and objc_map_get() will return NULL in that case.
    So a result of NULL means that they key *was* found, and the value
    associated with it was NULL.  */
-static inline tree
+inline tree
 objc_map_get (objc_map_t map, /* struct tree_identifier * */tree key)
 {
   /* The inline implementation is private and may change without notice.  */
@@ -169,7 +169,7 @@ objc_map_get (objc_map_t map, /* struct tree_identifier * */tree key)
    You can use any identifier as key, with the exception of NULL.
 
    You can use any tree as value, including NULL.  */
-static inline
+inline
 void objc_map_put (objc_map_t map, /*struct tree_identifier * */tree key, tree value)
 {
   /* The inline implementation is private and may change without notice.  */
@@ -243,7 +243,7 @@ typedef size_t objc_map_iterator_t;
 /* Initialize an iterator to iterate over the specified objc_map.  You
    must use this before starting the iteration, to get a working
    iterator.  */
-static inline
+inline
 void
 objc_map_iterator_initialize (objc_map_t map ATTRIBUTE_UNUSED, objc_map_iterator_t *i)
 {
@@ -262,7 +262,7 @@ objc_map_iterator_initialize (objc_map_t map ATTRIBUTE_UNUSED, objc_map_iterator
    been initialized using objc_map_iterator_initialize().  Note that
    because this function is modifying the iterator, you need to pass a
    pointer to it.  */
-static inline
+inline
 int
 objc_map_iterator_move_to_next (objc_map_t map, objc_map_iterator_t *i)
 {
@@ -285,7 +285,7 @@ objc_map_iterator_move_to_next (objc_map_t map, objc_map_iterator_t *i)
    first element), and only if the last call returned
    OBJC_MAP_SUCCESS.  The behavior is otherwise undefined, probably a
    segmentation fault.  */
-static inline
+inline
 tree
 objc_map_iterator_current_key (objc_map_t map, objc_map_iterator_t i)
 {
@@ -298,7 +298,7 @@ objc_map_iterator_current_key (objc_map_t map, objc_map_iterator_t i)
    the first element), and only if the last call returned
    OBJC_MAP_SUCCESS.  The behavior is otherwise undefined, probably a
    segmentation fault.  */
-static inline
+inline
 tree
 objc_map_iterator_current_value (objc_map_t map, objc_map_iterator_t i)
 {
diff --git a/gcc/objc/objc-next-metadata-tags.h b/gcc/objc/objc-next-metadata-tags.h
index 6d42981..b4ad019 100644
--- a/gcc/objc/objc-next-metadata-tags.h
+++ b/gcc/objc/objc-next-metadata-tags.h
@@ -1,5 +1,5 @@
 /* Declarations for meta-data attribute tags.
-   Copyright (C) 2011-2022 Free Software Foundation, Inc.
+   Copyright (C) 2011-2023 Free Software Foundation, Inc.
    Contributed by Iain Sandoe
 
 This file is part of GCC.
diff --git a/gcc/objc/objc-next-runtime-abi-01.cc b/gcc/objc/objc-next-runtime-abi-01.cc
index 409b777..8f68f78 100644
--- a/gcc/objc/objc-next-runtime-abi-01.cc
+++ b/gcc/objc/objc-next-runtime-abi-01.cc
@@ -1,5 +1,5 @@
 /* Next Runtime (ABI-0/1) private.
-   Copyright (C) 2011-2022 Free Software Foundation, Inc.
+   Copyright (C) 2011-2023 Free Software Foundation, Inc.
    Contributed by Iain Sandoe (split from objc-act.cc)
 
 This file is part of GCC.
@@ -2443,7 +2443,7 @@ build_next_objc_exception_stuff (void)
   /* int _setjmp(...); */
   /* If the user includes <setjmp.h>, this shall be superseded by
      'int _setjmp(jmp_buf);' */
-  temp_type = build_varargs_function_type_list (integer_type_node, NULL_TREE);
+  temp_type = build_function_type (integer_type_node, NULL_TREE);
   objc_setjmp_decl
     = add_builtin_function (TAG_SETJMP, temp_type, 0, NOT_BUILT_IN, NULL, NULL_TREE);
 
diff --git a/gcc/objc/objc-next-runtime-abi-02.cc b/gcc/objc/objc-next-runtime-abi-02.cc
index 9ea63b1..bcfc0ce 100644
--- a/gcc/objc/objc-next-runtime-abi-02.cc
+++ b/gcc/objc/objc-next-runtime-abi-02.cc
@@ -1,5 +1,5 @@
 /* Next Runtime (ABI-2) private.
-   Copyright (C) 2011-2022 Free Software Foundation, Inc.
+   Copyright (C) 2011-2023 Free Software Foundation, Inc.
 
    Contributed by Iain Sandoe and based, in part, on an implementation in
    'branches/apple/trunk' contributed by Apple Computer Inc.
diff --git a/gcc/objc/objc-runtime-hooks.h b/gcc/objc/objc-runtime-hooks.h
index 5e966f6..9313d03 100644
--- a/gcc/objc/objc-runtime-hooks.h
+++ b/gcc/objc/objc-runtime-hooks.h
@@ -1,5 +1,5 @@
 /* Hooks to abstract the runtime meta-data generation for Objective C.
-   Copyright (C) 2011-2022 Free Software Foundation, Inc.
+   Copyright (C) 2011-2023 Free Software Foundation, Inc.
    Contributed by Iain Sandoe
 
 This file is part of GCC.
diff --git a/gcc/objc/objc-runtime-shared-support.cc b/gcc/objc/objc-runtime-shared-support.cc
index 75c28fb..70b668b 100644
--- a/gcc/objc/objc-runtime-shared-support.cc
+++ b/gcc/objc/objc-runtime-shared-support.cc
@@ -1,5 +1,5 @@
 /* Support routines shared by all runtimes.
-   Copyright (C) 2011-2022 Free Software Foundation, Inc.
+   Copyright (C) 2011-2023 Free Software Foundation, Inc.
    Contributed by Iain Sandoe (partially split from objc-act.cc)
 
 This file is part of GCC.
diff --git a/gcc/objc/objc-runtime-shared-support.h b/gcc/objc/objc-runtime-shared-support.h
index 5b6c212..31fb073 100644
--- a/gcc/objc/objc-runtime-shared-support.h
+++ b/gcc/objc/objc-runtime-shared-support.h
@@ -1,5 +1,5 @@
 /* Support routines shared by all runtimes.
-   Copyright (C) 2011-2022 Free Software Foundation, Inc.
+   Copyright (C) 2011-2023 Free Software Foundation, Inc.
    Contributed by Iain Sandoe
 
 This file is part of GCC.
diff --git a/gcc/objc/objc-tree.def b/gcc/objc/objc-tree.def
index d8afeab..2c6a135 100644
--- a/gcc/objc/objc-tree.def
+++ b/gcc/objc/objc-tree.def
@@ -1,7 +1,7 @@
 /* This file contains the definitions and documentation for the
    additional tree codes used in the Objective C front end (see tree.def
    for the standard codes).
-   Copyright (C) 1990-2022 Free Software Foundation, Inc.
+   Copyright (C) 1990-2023 Free Software Foundation, Inc.
 
 This file is part of GCC.