diff options
| author | Rolf Bjarne Kvinge <rolf@xamarin.com> | 2016-12-07 02:50:04 +0300 |
|---|---|---|
| committer | Zoltan Varga <vargaz@gmail.com> | 2016-12-07 02:50:04 +0300 |
| commit | aca1492e703b15ccc6fc2ea2927fc184d212c4fa (patch) | |
| tree | 7f786ec0c5c033385ac565d71d9e537db93d0543 | |
| parent | 6c326d3938c2fa2f199f7a274c968c0354f0fad1 (diff) | |
[llvm] Fix intrinsic Selector.GetHandle support. (#4105)mono-4.8.0.382mono-4.8.0-atkcocoa
An OBJC_IMAGE_INFO section must be emitted when we emit the native equivalent
of @selector for Selector.GetHandle, otherwise the Objective-C runtime will
not process the selectors in this image at runtime (and we may end up with
duplicate selectors in memory).
The AOT compiler already does this here: https://github.com/mono/mono/blob/2eda626316fd8f70cd98947af2f89b7ca9b0ebe5/mono/mini/aot-compiler.c#L9657-L9661
| -rw-r--r-- | mono/mini/mini-llvm.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/mono/mini/mini-llvm.c b/mono/mini/mini-llvm.c index b83c823acfb..ab39f174245 100644 --- a/mono/mini/mini-llvm.c +++ b/mono/mini/mini-llvm.c @@ -5810,8 +5810,19 @@ process_bb (EmitContext *ctx, MonoBasicBlock *bb) const char *name = (const char*)ins->inst_p0; LLVMValueRef var; - if (!ctx->module->objc_selector_to_var) + if (!ctx->module->objc_selector_to_var) { ctx->module->objc_selector_to_var = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); + + LLVMValueRef info_var = LLVMAddGlobal (ctx->lmodule, LLVMArrayType (LLVMInt8Type (), 8), "@OBJC_IMAGE_INFO"); + int32_t objc_imageinfo [] = { 0, 16 }; + LLVMSetInitializer (info_var, mono_llvm_create_constant_data_array ((uint8_t *) &objc_imageinfo, 8)); + LLVMSetLinkage (info_var, LLVMPrivateLinkage); + LLVMSetExternallyInitialized (info_var, TRUE); + LLVMSetSection (info_var, "__DATA, __objc_imageinfo,regular,no_dead_strip"); + LLVMSetAlignment (info_var, sizeof (mgreg_t)); + mark_as_used (ctx->module, info_var); + } + var = g_hash_table_lookup (ctx->module->objc_selector_to_var, name); if (!var) { LLVMValueRef indexes [16]; |