Merge llvm 3.5.0 release from ^/vendor/llvm/dist, resolve conflicts, and

preserve our customizations, where necessary.
author: dim <dim@FreeBSD.org> 2014-11-24 17:02:24 +0000
committer: dim <dim@FreeBSD.org> 2014-11-24 17:02:24 +0000
commit: 2c8643c6396b0a3db33430cf9380e70bbb9efce0 (patch)
tree: 4df130b28021d86e13bf4565ef58c1c5a5e093b4 /contrib/llvm/include/llvm-c/lto.h
parent: 678318cd20f7db4e6c6b85d83fe00fa327b04fca (diff)
parent: e27feadae0885aa074df58ebfda2e7a7f7a7d590 (diff)
download: FreeBSD-src-2c8643c6396b0a3db33430cf9380e70bbb9efce0.zip
FreeBSD-src-2c8643c6396b0a3db33430cf9380e70bbb9efce0.tar.gz
1 files changed, 158 insertions, 14 deletions
diff --git a/contrib/llvm/include/llvm-c/lto.h b/contrib/llvm/include/llvm-c/lto.h
index 89f54b7..c525710 100644
--- a/contrib/llvm/include/llvm-c/lto.h
+++ b/contrib/llvm/include/llvm-c/lto.h
@@ -40,8 +40,11 @@ typedef bool lto_bool_t;
  * @{
  */
 
-#define LTO_API_VERSION 5
+#define LTO_API_VERSION 10
 
+/**
+ * \since prior to LTO_API_VERSION=3
+ */
 typedef enum {
     LTO_SYMBOL_ALIGNMENT_MASK              = 0x0000001F, /* log2 of alignment */
     LTO_SYMBOL_PERMISSIONS_MASK            = 0x000000E0,
@@ -62,23 +65,29 @@ typedef enum {
     LTO_SYMBOL_SCOPE_DEFAULT_CAN_BE_HIDDEN = 0x00002800
 } lto_symbol_attributes;
 
+/**
+ * \since prior to LTO_API_VERSION=3
+ */
 typedef enum {
     LTO_DEBUG_MODEL_NONE         = 0,
     LTO_DEBUG_MODEL_DWARF        = 1
 } lto_debug_model;
 
+/**
+ * \since prior to LTO_API_VERSION=3
+ */
 typedef enum {
     LTO_CODEGEN_PIC_MODEL_STATIC         = 0,
     LTO_CODEGEN_PIC_MODEL_DYNAMIC        = 1,
-    LTO_CODEGEN_PIC_MODEL_DYNAMIC_NO_PIC = 2
+    LTO_CODEGEN_PIC_MODEL_DYNAMIC_NO_PIC = 2,
+    LTO_CODEGEN_PIC_MODEL_DEFAULT        = 3
 } lto_codegen_model;
 
-
 /** opaque reference to a loaded object module */
-typedef struct LTOModule*         lto_module_t;
+typedef struct LLVMOpaqueLTOModule *lto_module_t;
 
 /** opaque reference to a code generator */
-typedef struct LTOCodeGenerator*  lto_code_gen_t;
+typedef struct LLVMOpaqueLTOCodeGenerator *lto_code_gen_t;
 
 #ifdef __cplusplus
 extern "C" {
@@ -86,6 +95,8 @@ extern "C" {
 
 /**
  * Returns a printable string.
+ *
+ * \since prior to LTO_API_VERSION=3
  */
 extern const char*
 lto_get_version(void);
@@ -93,12 +104,16 @@ lto_get_version(void);
 
 /**
  * Returns the last error string or NULL if last operation was successful.
+ *
+ * \since prior to LTO_API_VERSION=3
  */
 extern const char*
 lto_get_error_message(void);
 
 /**
  * Checks if a file is a loadable object file.
+ *
+ * \since prior to LTO_API_VERSION=3
  */
 extern lto_bool_t
 lto_module_is_object_file(const char* path);
@@ -106,6 +121,8 @@ lto_module_is_object_file(const char* path);
 
 /**
  * Checks if a file is a loadable object compiled for requested target.
+ *
+ * \since prior to LTO_API_VERSION=3
  */
 extern lto_bool_t
 lto_module_is_object_file_for_target(const char* path,
@@ -114,6 +131,8 @@ lto_module_is_object_file_for_target(const char* path,
 
 /**
  * Checks if a buffer is a loadable object file.
+ *
+ * \since prior to LTO_API_VERSION=3
  */
 extern lto_bool_t
 lto_module_is_object_file_in_memory(const void* mem, size_t length);
@@ -121,6 +140,8 @@ lto_module_is_object_file_in_memory(const void* mem, size_t length);
 
 /**
  * Checks if a buffer is a loadable object compiled for requested target.
+ *
+ * \since prior to LTO_API_VERSION=3
  */
 extern lto_bool_t
 lto_module_is_object_file_in_memory_for_target(const void* mem, size_t length,
@@ -130,6 +151,8 @@ lto_module_is_object_file_in_memory_for_target(const void* mem, size_t length,
 /**
  * Loads an object file from disk.
  * Returns NULL on error (check lto_get_error_message() for details).
+ *
+ * \since prior to LTO_API_VERSION=3
  */
 extern lto_module_t
 lto_module_create(const char* path);
@@ -138,13 +161,27 @@ lto_module_create(const char* path);
 /**
  * Loads an object file from memory.
  * Returns NULL on error (check lto_get_error_message() for details).
+ *
+ * \since prior to LTO_API_VERSION=3
  */
 extern lto_module_t
 lto_module_create_from_memory(const void* mem, size_t length);
 
 /**
+ * Loads an object file from memory with an extra path argument.
+ * Returns NULL on error (check lto_get_error_message() for details).
+ *
+ * \since prior to LTO_API_VERSION=9
+ */
+extern lto_module_t
+lto_module_create_from_memory_with_path(const void* mem, size_t length,
+                                        const char *path);
+
+/**
  * Loads an object file from disk. The seek point of fd is not preserved.
  * Returns NULL on error (check lto_get_error_message() for details).
+ *
+ * \since LTO_API_VERSION=5
  */
 extern lto_module_t
 lto_module_create_from_fd(int fd, const char *path, size_t file_size);
@@ -152,28 +189,34 @@ lto_module_create_from_fd(int fd, const char *path, size_t file_size);
 /**
  * Loads an object file from disk. The seek point of fd is not preserved.
  * Returns NULL on error (check lto_get_error_message() for details).
+ *
+ * \since LTO_API_VERSION=5
  */
 extern lto_module_t
 lto_module_create_from_fd_at_offset(int fd, const char *path, size_t file_size,
                                     size_t map_size, off_t offset);
 
-
 /**
  * Frees all memory internally allocated by the module.
  * Upon return the lto_module_t is no longer valid.
+ *
+ * \since prior to LTO_API_VERSION=3
  */
 extern void
 lto_module_dispose(lto_module_t mod);
 
-
 /**
  * Returns triple string which the object module was compiled under.
+ *
+ * \since prior to LTO_API_VERSION=3
  */
 extern const char*
 lto_module_get_target_triple(lto_module_t mod);
 
 /**
  * Sets triple string with which the object will be codegened.
+ *
+ * \since LTO_API_VERSION=4
  */
 extern void
 lto_module_set_target_triple(lto_module_t mod, const char *triple);
@@ -181,6 +224,8 @@ lto_module_set_target_triple(lto_module_t mod, const char *triple);
 
 /**
  * Returns the number of symbols in the object module.
+ *
+ * \since prior to LTO_API_VERSION=3
  */
 extern unsigned int
 lto_module_get_num_symbols(lto_module_t mod);
@@ -188,6 +233,8 @@ lto_module_get_num_symbols(lto_module_t mod);
 
 /**
  * Returns the name of the ith symbol in the object module.
+ *
+ * \since prior to LTO_API_VERSION=3
  */
 extern const char*
 lto_module_get_symbol_name(lto_module_t mod, unsigned int index);
@@ -195,40 +242,116 @@ lto_module_get_symbol_name(lto_module_t mod, unsigned int index);
 
 /**
  * Returns the attributes of the ith symbol in the object module.
+ *
+ * \since prior to LTO_API_VERSION=3
  */
 extern lto_symbol_attributes
 lto_module_get_symbol_attribute(lto_module_t mod, unsigned int index);
 
 
 /**
+ * Returns the number of dependent libraries in the object module.
+ *
+ * \since LTO_API_VERSION=8
+ */
+extern unsigned int
+lto_module_get_num_deplibs(lto_module_t mod);
+
+
+/**
+ * Returns the ith dependent library in the module.
+ *
+ * \since LTO_API_VERSION=8
+ */
+extern const char*
+lto_module_get_deplib(lto_module_t mod, unsigned int index);
+
+
+/**
+ * Returns the number of linker options in the object module.
+ *
+ * \since LTO_API_VERSION=8
+ */
+extern unsigned int
+lto_module_get_num_linkeropts(lto_module_t mod);
+
+
+/**
+ * Returns the ith linker option in the module.
+ *
+ * \since LTO_API_VERSION=8
+ */
+extern const char*
+lto_module_get_linkeropt(lto_module_t mod, unsigned int index);
+
+
+/**
+ * Diagnostic severity.
+ *
+ * \since LTO_API_VERSION=7
+ */
+typedef enum {
+  LTO_DS_ERROR = 0,
+  LTO_DS_WARNING = 1,
+  LTO_DS_REMARK = 3, // Added in LTO_API_VERSION=10.
+  LTO_DS_NOTE = 2
+} lto_codegen_diagnostic_severity_t;
+
+/**
+ * Diagnostic handler type.
+ * \p severity defines the severity.
+ * \p diag is the actual diagnostic.
+ * The diagnostic is not prefixed by any of severity keyword, e.g., 'error: '.
+ * \p ctxt is used to pass the context set with the diagnostic handler.
+ *
+ * \since LTO_API_VERSION=7
+ */
+typedef void (*lto_diagnostic_handler_t)(
+    lto_codegen_diagnostic_severity_t severity, const char *diag, void *ctxt);
+
+/**
+ * Set a diagnostic handler and the related context (void *).
+ * This is more general than lto_get_error_message, as the diagnostic handler
+ * can be called at anytime within lto.
+ *
+ * \since LTO_API_VERSION=7
+ */
+extern void lto_codegen_set_diagnostic_handler(lto_code_gen_t,
+                                               lto_diagnostic_handler_t,
+                                               void *);
+
+/**
  * Instantiates a code generator.
  * Returns NULL on error (check lto_get_error_message() for details).
+ *
+ * \since prior to LTO_API_VERSION=3
  */
 extern lto_code_gen_t
 lto_codegen_create(void);
 
-
 /**
  * Frees all code generator and all memory it internally allocated.
  * Upon return the lto_code_gen_t is no longer valid.
+ *
+ * \since prior to LTO_API_VERSION=3
  */
 extern void
 lto_codegen_dispose(lto_code_gen_t);
 
-
-
 /**
  * Add an object module to the set of modules for which code will be generated.
  * Returns true on error (check lto_get_error_message() for details).
+ *
+ * \since prior to LTO_API_VERSION=3
  */
 extern lto_bool_t
 lto_codegen_add_module(lto_code_gen_t cg, lto_module_t mod);
 
-
-
 /**
  * Sets if debug info should be generated.
  * Returns true on error (check lto_get_error_message() for details).
+ *
+ * \since prior to LTO_API_VERSION=3
  */
 extern lto_bool_t
 lto_codegen_set_debug_model(lto_code_gen_t cg, lto_debug_model);
@@ -237,6 +360,8 @@ lto_codegen_set_debug_model(lto_code_gen_t cg, lto_debug_model);
 /**
  * Sets which PIC code model to generated.
  * Returns true on error (check lto_get_error_message() for details).
+ *
+ * \since prior to LTO_API_VERSION=3
  */
 extern lto_bool_t
 lto_codegen_set_pic_model(lto_code_gen_t cg, lto_codegen_model);
@@ -244,6 +369,8 @@ lto_codegen_set_pic_model(lto_code_gen_t cg, lto_codegen_model);
 
 /**
  * Sets the cpu to generate code for.
+ *
+ * \since LTO_API_VERSION=4
  */
 extern void
 lto_codegen_set_cpu(lto_code_gen_t cg, const char *cpu);
@@ -252,20 +379,27 @@ lto_codegen_set_cpu(lto_code_gen_t cg, const char *cpu);
 /**
  * Sets the location of the assembler tool to run. If not set, libLTO
  * will use gcc to invoke the assembler.
+ *
+ * \since LTO_API_VERSION=3
  */
 extern void
 lto_codegen_set_assembler_path(lto_code_gen_t cg, const char* path);
 
 /**
  * Sets extra arguments that libLTO should pass to the assembler.
+ *
+ * \since LTO_API_VERSION=4
  */
 extern void
 lto_codegen_set_assembler_args(lto_code_gen_t cg, const char **args,
                                int nargs);
 
 /**
- * Tells LTO optimization passes that this symbol must be preserved
- * because it is referenced by native code or a command line option.
+ * Adds to a list of all global symbols that must exist in the final generated
+ * code. If a function is not listed there, it might be inlined into every usage
+ * and optimized away.
+ *
+ * \since prior to LTO_API_VERSION=3
  */
 extern void
 lto_codegen_add_must_preserve_symbol(lto_code_gen_t cg, const char* symbol);
@@ -274,6 +408,8 @@ lto_codegen_add_must_preserve_symbol(lto_code_gen_t cg, const char* symbol);
  * Writes a new object file at the specified path that contains the
  * merged contents of all modules added so far.
  * Returns true on error (check lto_get_error_message() for details).
+ *
+ * \since LTO_API_VERSION=5
  */
 extern lto_bool_t
 lto_codegen_write_merged_modules(lto_code_gen_t cg, const char* path);
@@ -285,6 +421,8 @@ lto_codegen_write_merged_modules(lto_code_gen_t cg, const char* path);
  * lto_code_gen_t and will be freed when lto_codegen_dispose()
  * is called, or lto_codegen_compile() is called again.
  * On failure, returns NULL (check lto_get_error_message() for details).
+ *
+ * \since prior to LTO_API_VERSION=3
  */
 extern const void*
 lto_codegen_compile(lto_code_gen_t cg, size_t* length);
@@ -292,6 +430,8 @@ lto_codegen_compile(lto_code_gen_t cg, size_t* length);
 /**
  * Generates code for all added modules into one native object file.
  * The name of the file is written to name. Returns true on error.
+ *
+ * \since LTO_API_VERSION=5
  */
 extern lto_bool_t
 lto_codegen_compile_to_file(lto_code_gen_t cg, const char** name);
@@ -299,6 +439,8 @@ lto_codegen_compile_to_file(lto_code_gen_t cg, const char** name);
 
 /**
  * Sets options to help debug codegen bugs.
+ *
+ * \since prior to LTO_API_VERSION=3
  */
 extern void
 lto_codegen_debug_options(lto_code_gen_t cg, const char *);
@@ -306,6 +448,8 @@ lto_codegen_debug_options(lto_code_gen_t cg, const char *);
 /**
  * Initializes LLVM disassemblers.
  * FIXME: This doesn't really belong here.
+ *
+ * \since LTO_API_VERSION=5
  */
 extern void
 lto_initialize_disassembler(void);
author	dim <dim@FreeBSD.org>	2014-11-24 17:02:24 +0000
committer	dim <dim@FreeBSD.org>	2014-11-24 17:02:24 +0000
commit	2c8643c6396b0a3db33430cf9380e70bbb9efce0 (patch)
tree	4df130b28021d86e13bf4565ef58c1c5a5e093b4 /contrib/llvm/include/llvm-c/lto.h
parent	678318cd20f7db4e6c6b85d83fe00fa327b04fca (diff)
parent	e27feadae0885aa074df58ebfda2e7a7f7a7d590 (diff)
download	FreeBSD-src-2c8643c6396b0a3db33430cf9380e70bbb9efce0.zip FreeBSD-src-2c8643c6396b0a3db33430cf9380e70bbb9efce0.tar.gz