From b7b3687bef6ac5fe9d9771bd03063dcb0096b1e4 Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Tue, 27 Apr 2010 22:46:12 +0000 Subject: [PATCH] fixing cherrypicked d530d836 --- mono/mini/ChangeLog | 4 ++++ mono/mini/aot-compiler.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog index 9829e2af033..5b55da2bca5 100644 --- a/mono/mini/ChangeLog +++ b/mono/mini/ChangeLog @@ -1,3 +1,7 @@ +2010-04-28 Zoltan Varga + + * aot-compiler.c (emit_got_info): Double the buffer size to avoid an assert. + 2009-11-26 Zoltan Varga * mini.h (MonoDebugOptions): Add 'explicit_null_checks' option. diff --git a/mono/mini/aot-compiler.c b/mono/mini/aot-compiler.c index 326e5cd8966..4a78f166b5d 100644 --- a/mono/mini/aot-compiler.c +++ b/mono/mini/aot-compiler.c @@ -5143,7 +5143,7 @@ emit_got_info (MonoAotCompile *acfg) */ /* Encode info required to decode shared GOT entries */ - buf_size = acfg->got_patches->len * 64; + buf_size = acfg->got_patches->len * 128; p = buf = mono_mempool_alloc (acfg->mempool, buf_size); got_info_offsets = mono_mempool_alloc (acfg->mempool, acfg->got_patches->len * sizeof (guint32)); acfg->plt_got_info_offsets = mono_mempool_alloc (acfg->mempool, acfg->plt_offset * sizeof (guint32)); -- GitLab