Merge pull request #4444 from lateralusX/jlorenss/windows-unwind-info

[mono.git] / mono / mini / unwind.c

diff --git a/mono/mini/unwind.c b/mono/mini/unwind.c
index 3f8a2bdfcdedcd623a2c6014326496db48846901..f63171e52f171eaf656667e33b5a9297c37231f2 100644 (file)
--- a/mono/mini/unwind.c
+++ b/mono/mini/unwind.c
@@ -449,6 +449,13 @@ mono_unwind_ops_encode_full (GSList *unwind_ops, guint32 *out_len, gboolean enab
                        g_assert (op->val == 0);
                        *p ++ = op->op;
                        break;
+#if defined(TARGET_WIN32) && defined(TARGET_AMD64)
+               case DW_CFA_mono_sp_alloc_info_win64:
+               case DW_CFA_mono_fp_alloc_info_win64:
+                       // Drop Windows specific unwind op's. These op's are currently
+                       // only used when registering unwind info with Windows OS unwinder.
+                       break;
+#endif
                default:
                        g_assert_not_reached ();
                        break;