fixup! WIP: Add support for function attributes

Author: antoyo

gcc/jit/jit-playback.cc

@@ -512,6 +512,8 @@ const char* fn_attribute_to_string(gcc_jit_fn_attribute attr)
   {
     case GCC_JIT_FN_ATTRIBUTE_TARGET:
       return "target";
+    case GCC_JIT_FN_ATTRIBUTE_USED:
+      return "used";
     case GCC_JIT_FN_ATTRIBUTE_VISIBILITY:
       return "visibility";
   }
@@ -540,7 +542,8 @@ new_function (location *loc,
 	      int is_variadic,
 	      enum built_in_function builtin_id,
 	      int is_target_builtin,
-	      const std::vector<std::pair<gcc_jit_fn_attribute, std::string>> &attributes)
+	      const std::vector<gcc_jit_fn_attribute> &attributes,
+	      const std::vector<std::pair<gcc_jit_fn_attribute, std::string>> &string_attributes)
 {
   int i;
   param *param;
@@ -634,6 +637,21 @@ new_function (location *loc,
     }
 
   for (auto attr: attributes)
+  {
+    tree ident = get_identifier (fn_attribute_to_string (attr));
+
+    /* See handle_used_attribute in gcc/c-family/c-attribs.cc.  */
+    if (attr == GCC_JIT_FN_ATTRIBUTE_USED)
+    {
+      TREE_USED (fndecl) = 1;
+      DECL_PRESERVE_P (fndecl) = 1;
+    }
+
+    DECL_ATTRIBUTES (fndecl) =
+      tree_cons (ident, NULL_TREE, DECL_ATTRIBUTES (fndecl));
+  }
+
+  for (auto attr: string_attributes)
   {
     gcc_jit_fn_attribute& name = std::get<0>(attr);
     std::string& value = std::get<1>(attr);

gcc/jit/jit-playback.h

@@ -112,7 +112,8 @@ class context : public log_user
 		int is_variadic,
 		enum built_in_function builtin_id,
 		int is_target_builtin,
-		const std::vector<std::pair<gcc_jit_fn_attribute, std::string>> &attributes);
+		const std::vector<gcc_jit_fn_attribute> &attributes,
+		const std::vector<std::pair<gcc_jit_fn_attribute, std::string>> &string_attributes);
 
   lvalue *
   new_global (location *loc,

gcc/jit/jit-recording.cc

@@ -4182,7 +4182,8 @@ recording::function::function (context *ctxt,
   m_blocks (),
   m_fn_ptr_type (NULL),
   m_is_target_builtin (is_target_builtin),
-  m_attributes()
+  m_attributes(),
+  m_string_attributes()
 {
   for (int i = 0; i< num_params; i++)
     {
@@ -4243,7 +4244,8 @@ recording::function::replay_into (replayer *r)
 				     m_is_variadic,
 				     m_builtin_id,
 				     m_is_target_builtin,
-				     m_attributes));
+				     m_attributes,
+				     m_string_attributes));
 }
 
 /* Create a recording::local instance and add it to
@@ -4488,9 +4490,15 @@ recording::function::get_address (recording::location *loc)
 }
 
 void
-recording::function::add_attribute (gcc_jit_fn_attribute attribute, const char* value)
+recording::function::add_attribute (gcc_jit_fn_attribute attribute)
 {
-  m_attributes.push_back (std::make_pair (attribute, std::string (value)));
+  m_attributes.push_back (attribute);
+}
+
+void
+recording::function::add_string_attribute (gcc_jit_fn_attribute attribute, const char* value)
+{
+  m_string_attributes.push_back (std::make_pair (attribute, std::string (value)));
 }
 
 /* Implementation of recording::memento::make_debug_string for

gcc/jit/jit-recording.h

@@ -1434,7 +1434,8 @@ class function : public memento
 
   rvalue *get_address (location *loc);
 
-  void add_attribute (gcc_jit_fn_attribute attribute, const char* value);
+  void add_attribute (gcc_jit_fn_attribute attribute);
+  void add_string_attribute (gcc_jit_fn_attribute attribute, const char* value);
 
 private:
   string * make_debug_string () FINAL OVERRIDE;
@@ -1452,7 +1453,8 @@ class function : public memento
   auto_vec<block *> m_blocks;
   type *m_fn_ptr_type;
   int m_is_target_builtin;
-  std::vector<std::pair<gcc_jit_fn_attribute, std::string>> m_attributes;
+  std::vector<gcc_jit_fn_attribute> m_attributes;
+  std::vector<std::pair<gcc_jit_fn_attribute, std::string>> m_string_attributes;
 };
 
 class block : public memento

gcc/jit/libgccjit.cc

@@ -4084,11 +4084,19 @@ gcc_jit_type_set_packed (gcc_jit_type *type)
 }
 
 void
-gcc_jit_function_add_attribute (gcc_jit_function *func, gcc_jit_fn_attribute attribute, const char* value)
+gcc_jit_function_add_attribute (gcc_jit_function *func, gcc_jit_fn_attribute attribute)
 {
   RETURN_IF_FAIL (func, NULL, NULL, "NULL func");
 
-  func->add_attribute (attribute, value);
+  func->add_attribute (attribute);
+}
+
+void
+gcc_jit_function_add_string_attribute (gcc_jit_function *func, gcc_jit_fn_attribute attribute, const char* value)
+{
+  RETURN_IF_FAIL (func, NULL, NULL, "NULL func");
+
+  func->add_string_attribute (attribute, value);
 }
 
 void

gcc/jit/libgccjit.h

@@ -2041,13 +2041,17 @@ gcc_jit_type_set_packed (gcc_jit_type *type);
 enum gcc_jit_fn_attribute
 {
   GCC_JIT_FN_ATTRIBUTE_TARGET,
+  GCC_JIT_FN_ATTRIBUTE_USED,
   GCC_JIT_FN_ATTRIBUTE_VISIBILITY,
 };
 
 /* Add an attribute to a function.  */
 // TODO: also support integer values.
 extern void
-gcc_jit_function_add_attribute (gcc_jit_function *func, gcc_jit_fn_attribute attribute, const char* value);
+gcc_jit_function_add_attribute (gcc_jit_function *func, gcc_jit_fn_attribute attribute);
+
+extern void
+gcc_jit_function_add_string_attribute (gcc_jit_function *func, gcc_jit_fn_attribute attribute, const char* value);
 
 /* Variable attributes.  */
 enum gcc_jit_variable_attribute

gcc/jit/libgccjit.map

@@ -302,6 +302,7 @@ LIBGCCJIT_ABI_29 {
 LIBGCCJIT_ABI_30 {
   global:
     gcc_jit_function_add_attribute;
+    gcc_jit_function_add_string_attribute;
 } LIBGCCJIT_ABI_29;
 
 LIBGCCJIT_ABI_31 {