| Newsgroups |
gmane.comp.gnome.mono.patches |
| Message-ID |
<000001426eac4821-58d84bfd-6ddd-49a0-9533-8622aaf96d08-000000@email.amazonses.com> |
Branch: refs/heads/master
Home: https://github.com/mono/mono
Compare: https://github.com/mono/mono/compare/f200c99c3337...77e28973ac06
Commit: 77e28973ac06c9c9ca5fb5ea01143b24254a247c
Author: Zoltan Varga <[email protected]> (vargaz)
Date: 2013-11-19 04:42:23 GMT
URL: https://github.com/mono/mono/commit/77e28973ac06c9c9ca5fb5ea01143b24254a247c
[llvm] Make the rgctx arg a pointer type as well.
Changed paths:
M mono/mini/mini-llvm.c
Modified: mono/mini/mini-llvm.c
===================================================================
@@ -1085,7 +1085,7 @@
if (cinfo && cinfo->rgctx_arg) {
if (sinfo)
sinfo->rgctx_arg_pindex = pindex;
- param_types [pindex] = IntPtrType ();
+ param_types [pindex] = ctx->lmodule->ptr_type;
pindex ++;
}
if (cinfo && cinfo->imt_arg) {
@@ -1819,7 +1819,7 @@
g_assert (ctx->addresses [cfg->rgctx_var->dreg]);
rgctx_alloc = ctx->addresses [cfg->rgctx_var->dreg];
/* This volatile store will keep the alloca alive */
- store = mono_llvm_build_store (builder, ctx->rgctx_arg, rgctx_alloc, TRUE);
+ store = mono_llvm_build_store (builder, convert (ctx, ctx->rgctx_arg, IntPtrType ()), rgctx_alloc, TRUE);
set_metadata_flag (rgctx_alloc, "mono.this");
}
@@ -2014,7 +2014,7 @@
if (call->rgctx_arg_reg) {
g_assert (values [call->rgctx_arg_reg]);
g_assert (sinfo.rgctx_arg_pindex < nargs);
- args [sinfo.rgctx_arg_pindex] = convert (ctx, values [call->rgctx_arg_reg], IntPtrType ());
+ args [sinfo.rgctx_arg_pindex] = convert (ctx, values [call->rgctx_arg_reg], ctx->lmodule->ptr_type);
}
if (call->imt_arg_reg) {
g_assert (values [call->imt_arg_reg]);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches