Add disable_omit_fp support for LLVM (#2045)

Fixes mono/mono#18417

diff --git a/src/mono/mono/mini/mini-llvm-cpp.cpp b/src/mono/mono/mini/mini-llvm-cpp.cpp
index 0ca6853..86fca1c 100644 (file)
--- a/src/mono/mono/mini/mini-llvm-cpp.cpp
+++ b/src/mono/mono/mini/mini-llvm-cpp.cpp
@@ -455,6 +455,14 @@ mono_llvm_add_func_attr (LLVMValueRef func, AttrKind kind)
 }
 
 void
+mono_llvm_add_func_attr_nv (LLVMValueRef func, const char *attr_name, const char *attr_value)
+{
+       AttrBuilder NewAttrs;
+       NewAttrs.addAttribute (attr_name, attr_value);
+       unwrap<Function> (func)->addAttributes (AttributeList::FunctionIndex, NewAttrs);
+}
+
+void
 mono_llvm_add_param_attr (LLVMValueRef param, AttrKind kind)
 {
        Function *func = unwrap<Argument> (param)->getParent ();

diff --git a/src/mono/mono/mini/mini-llvm-cpp.h b/src/mono/mono/mini/mini-llvm-cpp.h
index 2ba1151..9c2e6d0 100644 (file)
--- a/src/mono/mono/mini/mini-llvm-cpp.h
+++ b/src/mono/mono/mini/mini-llvm-cpp.h
@@ -141,6 +141,9 @@ void
 mono_llvm_add_func_attr (LLVMValueRef func, AttrKind kind);
 
 void
+mono_llvm_add_func_attr_nv (LLVMValueRef func, const char *attr_name, const char *attr_value);
+
+void
 mono_llvm_add_param_attr (LLVMValueRef param, AttrKind kind);
 
 void

diff --git a/src/mono/mono/mini/mini-llvm.c b/src/mono/mono/mini/mini-llvm.c
index 0881f9a..00cd319 100644 (file)
--- a/src/mono/mono/mini/mini-llvm.c
+++ b/src/mono/mono/mini/mini-llvm.c
@@ -8559,6 +8559,9 @@ emit_method_inner (EmitContext *ctx)
 
        mono_llvm_add_func_attr (method, LLVM_ATTR_UW_TABLE);
 
+       if (cfg->disable_omit_fp)
+               mono_llvm_add_func_attr_nv (method, "no-frame-pointer-elim", "true");
+
        if (cfg->compile_aot) {
                if (is_externally_callable (ctx, cfg->method)) {
                        LLVMSetLinkage (method, LLVMExternalLinkage);