[mono/mono] fc169c38: [jit] Disable the optimization added by 63eb94e451a59491034516f2ec9f27d586b34d86 when using LLVM, the handler bblock has no in edges, which seems to cause problems when using LLVM.
| Newsgroups | gmane.comp.gnome.mono.patches |
|---|---|
| Message-ID | <000001421b64189c-3c2f02a4-ad13-4ee1-beb4-9424c1b40076-000000@email.amazonses.com> |
Branch: refs/heads/master
Home: https://github.com/mono/mono
Compare: https://github.com/mono/mono/compare/762d5fb72b4a...fc169c38396a
Commit: fc169c38396abc60534863e8e12896afc19a1bb3
Author: Zoltan Varga <[email protected]> (vargaz)
Date: 2013-11-03 00:35:50 GMT
URL: https://github.com/mono/mono/commit/fc169c38396abc60534863e8e12896afc19a1bb3
[jit] Disable the optimization added by 63eb94e451a59491034516f2ec9f27d586b34d86 when using LLVM, the handler bblock has no in edges, which seems to cause problems when using LLVM.
Changed paths:
M mono/mini/method-to-ir.c
Modified: mono/mini/method-to-ir.c
===================================================================
@@ -6687,7 +6687,8 @@ gboolean check_linkdemand (MonoCompile *cfg, MonoMethod *caller, MonoMethod *cal
* Linking the try block with the EH block hinders inlining as we won't be able to
* merge the bblocks from inlining and produce an artificial hole for no good reason.
*/
- // link_bblock (cfg, try_bb, tblock);
+ if (COMPILE_LLVM (cfg))
+ link_bblock (cfg, try_bb, tblock);
if (*(ip + clause->handler_offset) == CEE_POP)
tblock->flags |= BB_EXCEPTION_DEAD_OBJ;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches