chore: update stage0

stage0/src/runtime/alloc.cpp

@@ -467,16 +467,20 @@ void finalize_alloc() {
 LEAN_THREAD_VALUE(uint64_t, g_heartbeat, 0);
 #endif
 
-/* Helper function for increasing heartbeat even when LEAN_SMALL_ALLOCATOR is not defined */
-extern "C" LEAN_EXPORT void lean_inc_heartbeat() {
+void add_heartbeats(uint64_t count) {
 #ifdef LEAN_SMALL_ALLOCATOR
     if (g_heap)
-        g_heap->m_heartbeat++;
+        g_heap->m_heartbeat += count;
 #else
-    g_heartbeat++;
+    g_heartbeat += count;
 #endif
 }
 
+/* Helper function for increasing heartbeat even when LEAN_SMALL_ALLOCATOR is not defined */
+extern "C" LEAN_EXPORT void lean_inc_heartbeat() {
+    add_heartbeats(1);
+}
+
 uint64_t get_num_heartbeats() {
 #ifdef LEAN_SMALL_ALLOCATOR
     if (g_heap)

stage0/src/runtime/alloc.h

@@ -12,6 +12,7 @@ namespace lean {
 void init_thread_heap();
 void * alloc(size_t sz);
 void dealloc(void * o, size_t sz);
+void add_heartbeats(uint64_t count);
 uint64_t get_num_heartbeats();
 void initialize_alloc();
 void finalize_alloc();

stage0/src/runtime/io.cpp

@@ -639,6 +639,12 @@ extern "C" LEAN_EXPORT obj_res lean_io_get_num_heartbeats(obj_arg /* w */) {
     return io_result_mk_ok(lean_uint64_to_nat(get_num_heartbeats()));
 }
 
+/* addHeartbeats (count : Int64) : BaseIO Unit */
+extern "C" LEAN_EXPORT obj_res lean_io_add_heartbeats(int64_t count, obj_arg /* w */) {
+    add_heartbeats(count);
+    return io_result_mk_ok(box(0));
+}
+
 extern "C" LEAN_EXPORT obj_res lean_io_getenv(b_obj_arg env_var, obj_arg) {
 #if defined(LEAN_EMSCRIPTEN)
     // HACK(WN): getenv doesn't seem to work in Emscripten even though it should

stage0/stdlib/Init/Data/BitVec/Lemmas.c

@@ -1,6 +1,6 @@
 // Lean compiler output
 // Module: Init.Data.BitVec.Lemmas
-// Imports: Init.Data.Bool Init.Data.BitVec.Basic Init.Data.Fin.Lemmas Init.Data.Nat.Lemmas
+// Imports: Init.Data.Bool Init.Data.BitVec.Basic Init.Data.Fin.Lemmas Init.Data.Nat.Lemmas Init.Data.Nat.Mod
 #include <lean/lean.h>
 #if defined(__clang__)
 #pragma clang diagnostic ignored "-Wunused-parameter"
@@ -87,6 +87,7 @@ lean_object* initialize_Init_Data_Bool(uint8_t builtin, lean_object*);
 lean_object* initialize_Init_Data_BitVec_Basic(uint8_t builtin, lean_object*);
 lean_object* initialize_Init_Data_Fin_Lemmas(uint8_t builtin, lean_object*);
 lean_object* initialize_Init_Data_Nat_Lemmas(uint8_t builtin, lean_object*);
+lean_object* initialize_Init_Data_Nat_Mod(uint8_t builtin, lean_object*);
 static bool _G_initialized = false;
 LEAN_EXPORT lean_object* initialize_Init_Data_BitVec_Lemmas(uint8_t builtin, lean_object* w) {
 lean_object * res;
@@ -104,6 +105,9 @@ lean_dec_ref(res);
 res = initialize_Init_Data_Nat_Lemmas(builtin, lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
+res = initialize_Init_Data_Nat_Mod(builtin, lean_io_mk_world());
+if (lean_io_result_is_error(res)) return res;
+lean_dec_ref(res);
 return lean_io_result_mk_ok(lean_box(0));
 }
 #ifdef __cplusplus

stage0/stdlib/Init/Data/Nat/Bitwise/Basic.c

@@ -284,7 +284,7 @@ _start:
 lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; uint8_t x_7; 
 x_3 = lean_nat_shiftr(x_1, x_2);
 x_4 = lean_unsigned_to_nat(1u);
-x_5 = lean_nat_land(x_3, x_4);
+x_5 = lean_nat_land(x_4, x_3);
 lean_dec(x_3);
 x_6 = lean_unsigned_to_nat(0u);
 x_7 = lean_nat_dec_eq(x_5, x_6);

stage0/stdlib/Init/Data/String/Basic.c

@@ -236,6 +236,7 @@ LEAN_EXPORT lean_object* l_String_takeRightWhile___boxed(lean_object*, lean_obje
 LEAN_EXPORT lean_object* l_String_get_x21___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_String_nextUntil(lean_object*, lean_object*, lean_object*);
 lean_object* lean_string_length(lean_object*);
+LEAN_EXPORT uint8_t l_Substring_sameAs(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_String_toLower(lean_object*);
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
@@ -245,6 +246,7 @@ LEAN_EXPORT lean_object* l_String_prev___boxed(lean_object*, lean_object*);
 uint8_t lean_uint32_dec_eq(uint32_t, uint32_t);
 LEAN_EXPORT lean_object* l_Substring_toString___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_String_extract___boxed(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Substring_sameAs___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_String_contains___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_String_split___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_String_map(lean_object*, lean_object*);
@@ -5561,6 +5563,42 @@ x_1 = l_Substring_hasBeq___closed__1;
 return x_1;
 }
 }
+LEAN_EXPORT uint8_t l_Substring_sameAs(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; lean_object* x_4; uint8_t x_5; 
+x_3 = lean_ctor_get(x_1, 1);
+lean_inc(x_3);
+x_4 = lean_ctor_get(x_2, 1);
+lean_inc(x_4);
+x_5 = lean_nat_dec_eq(x_3, x_4);
+lean_dec(x_4);
+lean_dec(x_3);
+if (x_5 == 0)
+{
+uint8_t x_6; 
+lean_dec(x_2);
+lean_dec(x_1);
+x_6 = 0;
+return x_6;
+}
+else
+{
+uint8_t x_7; 
+x_7 = l_Substring_beq(x_1, x_2);
+return x_7;
+}
+}
+}
+LEAN_EXPORT lean_object* l_Substring_sameAs___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+uint8_t x_3; lean_object* x_4; 
+x_3 = l_Substring_sameAs(x_1, x_2);
+x_4 = lean_box(x_3);
+return x_4;
+}
+}
 LEAN_EXPORT lean_object* l_String_drop(lean_object* x_1, lean_object* x_2) {
 _start:
 {

stage0/stdlib/Init/Grind.c

@@ -1,6 +1,6 @@
 // Lean compiler output
 // Module: Init.Grind
-// Imports: Init.Grind.Norm Init.Grind.Tactics Init.Grind.Lemmas
+// Imports: Init.Grind.Norm Init.Grind.Tactics Init.Grind.Lemmas Init.Grind.Cases
 #include <lean/lean.h>
 #if defined(__clang__)
 #pragma clang diagnostic ignored "-Wunused-parameter"
@@ -16,6 +16,7 @@ extern "C" {
 lean_object* initialize_Init_Grind_Norm(uint8_t builtin, lean_object*);
 lean_object* initialize_Init_Grind_Tactics(uint8_t builtin, lean_object*);
 lean_object* initialize_Init_Grind_Lemmas(uint8_t builtin, lean_object*);
+lean_object* initialize_Init_Grind_Cases(uint8_t builtin, lean_object*);
 static bool _G_initialized = false;
 LEAN_EXPORT lean_object* initialize_Init_Grind(uint8_t builtin, lean_object* w) {
 lean_object * res;
@@ -30,6 +31,9 @@ lean_dec_ref(res);
 res = initialize_Init_Grind_Lemmas(builtin, lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
+res = initialize_Init_Grind_Cases(builtin, lean_io_mk_world());
+if (lean_io_result_is_error(res)) return res;
+lean_dec_ref(res);
 return lean_io_result_mk_ok(lean_box(0));
 }
 #ifdef __cplusplus

stage0/stdlib/Init/Grind/Cases.c

@@ -0,0 +1,29 @@
+// Lean compiler output
+// Module: Init.Grind.Cases
+// Imports: Init.Core
+#include <lean/lean.h>
+#if defined(__clang__)
+#pragma clang diagnostic ignored "-Wunused-parameter"
+#pragma clang diagnostic ignored "-Wunused-label"
+#elif defined(__GNUC__) && !defined(__CLANG__)
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-label"
+#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
+#endif
+#ifdef __cplusplus
+extern "C" {
+#endif
+lean_object* initialize_Init_Core(uint8_t builtin, lean_object*);
+static bool _G_initialized = false;
+LEAN_EXPORT lean_object* initialize_Init_Grind_Cases(uint8_t builtin, lean_object* w) {
+lean_object * res;
+if (_G_initialized) return lean_io_result_mk_ok(lean_box(0));
+_G_initialized = true;
+res = initialize_Init_Core(builtin, lean_io_mk_world());
+if (lean_io_result_is_error(res)) return res;
+lean_dec_ref(res);
+return lean_io_result_mk_ok(lean_box(0));
+}
+#ifdef __cplusplus
+}
+#endif

stage0/stdlib/Init/Grind/Tactics.c

@@ -13,6 +13,81 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+LEAN_EXPORT uint8_t l_Lean_Grind_Config_eager___default;
+LEAN_EXPORT uint8_t l___private_Init_Grind_Tactics_0__Lean_Grind_beqConfig____x40_Init_Grind_Tactics___hyg_16_(uint8_t, uint8_t);
+static lean_object* l_Lean_Grind_instBEqConfig___closed__1;
+LEAN_EXPORT lean_object* l_Lean_Grind_instBEqConfig;
+LEAN_EXPORT uint8_t l_Lean_Grind_instInhabitedConfig;
+LEAN_EXPORT lean_object* l___private_Init_Grind_Tactics_0__Lean_Grind_beqConfig____x40_Init_Grind_Tactics___hyg_16____boxed(lean_object*, lean_object*);
+static uint8_t _init_l_Lean_Grind_Config_eager___default() {
+_start:
+{
+uint8_t x_1; 
+x_1 = 0;
+return x_1;
+}
+}
+static uint8_t _init_l_Lean_Grind_instInhabitedConfig() {
+_start:
+{
+uint8_t x_1; 
+x_1 = 0;
+return x_1;
+}
+}
+LEAN_EXPORT uint8_t l___private_Init_Grind_Tactics_0__Lean_Grind_beqConfig____x40_Init_Grind_Tactics___hyg_16_(uint8_t x_1, uint8_t x_2) {
+_start:
+{
+if (x_1 == 0)
+{
+if (x_2 == 0)
+{
+uint8_t x_3; 
+x_3 = 1;
+return x_3;
+}
+else
+{
+uint8_t x_4; 
+x_4 = 0;
+return x_4;
+}
+}
+else
+{
+return x_2;
+}
+}
+}
+LEAN_EXPORT lean_object* l___private_Init_Grind_Tactics_0__Lean_Grind_beqConfig____x40_Init_Grind_Tactics___hyg_16____boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+uint8_t x_3; uint8_t x_4; uint8_t x_5; lean_object* x_6; 
+x_3 = lean_unbox(x_1);
+lean_dec(x_1);
+x_4 = lean_unbox(x_2);
+lean_dec(x_2);
+x_5 = l___private_Init_Grind_Tactics_0__Lean_Grind_beqConfig____x40_Init_Grind_Tactics___hyg_16_(x_3, x_4);
+x_6 = lean_box(x_5);
+return x_6;
+}
+}
+static lean_object* _init_l_Lean_Grind_instBEqConfig___closed__1() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_alloc_closure((void*)(l___private_Init_Grind_Tactics_0__Lean_Grind_beqConfig____x40_Init_Grind_Tactics___hyg_16____boxed), 2, 0);
+return x_1;
+}
+}
+static lean_object* _init_l_Lean_Grind_instBEqConfig() {
+_start:
+{
+lean_object* x_1; 
+x_1 = l_Lean_Grind_instBEqConfig___closed__1;
+return x_1;
+}
+}
 lean_object* initialize_Init_Tactics(uint8_t builtin, lean_object*);
 static bool _G_initialized = false;
 LEAN_EXPORT lean_object* initialize_Init_Grind_Tactics(uint8_t builtin, lean_object* w) {
@@ -22,6 +97,12 @@ _G_initialized = true;
 res = initialize_Init_Tactics(builtin, lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
+l_Lean_Grind_Config_eager___default = _init_l_Lean_Grind_Config_eager___default();
+l_Lean_Grind_instInhabitedConfig = _init_l_Lean_Grind_instInhabitedConfig();
+l_Lean_Grind_instBEqConfig___closed__1 = _init_l_Lean_Grind_instBEqConfig___closed__1();
+lean_mark_persistent(l_Lean_Grind_instBEqConfig___closed__1);
+l_Lean_Grind_instBEqConfig = _init_l_Lean_Grind_instBEqConfig();
+lean_mark_persistent(l_Lean_Grind_instBEqConfig);
 return lean_io_result_mk_ok(lean_box(0));
 }
 #ifdef __cplusplus

stage0/stdlib/Init/Prelude.c

@@ -398,6 +398,7 @@ LEAN_EXPORT lean_object* l_Lean_Syntax_getKind(lean_object*);
 static lean_object* l_Array_mkArray1___rarg___closed__1;
 LEAN_EXPORT lean_object* l_EStateM_run___rarg(lean_object*, lean_object*);
 lean_object* lean_string_mk(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_SourceInfo_getTailPos_x3f(lean_object*, uint8_t);
 LEAN_EXPORT lean_object* l_ReaderT_instMonadLift(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint64_t l_instInhabitedUInt64;
 static lean_object* l_Lean_instInhabitedMacroScopesView___closed__1;
@@ -511,6 +512,7 @@ LEAN_EXPORT lean_object* l_Lean_Syntax_getArg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_instMonadQuotationUnexpandM___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_ReaderT_bind___at_Lean_Macro_instMonadRefMacroM___spec__2(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Nat_mul___boxed(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_SourceInfo_getTailPos_x3f___boxed(lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_Lean_Syntax_matchesNull(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_instMonadWithReaderOfOfMonadFunctor___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_readThe___rarg(lean_object*);
@@ -8100,6 +8102,71 @@ lean_dec(x_1);
 return x_4;
 }
 }
+LEAN_EXPORT lean_object* l_Lean_SourceInfo_getTailPos_x3f(lean_object* x_1, uint8_t x_2) {
+_start:
+{
+switch (lean_obj_tag(x_1)) {
+case 0:
+{
+lean_object* x_3; lean_object* x_4; 
+x_3 = lean_ctor_get(x_1, 3);
+lean_inc(x_3);
+x_4 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_4, 0, x_3);
+return x_4;
+}
+case 1:
+{
+uint8_t x_5; 
+x_5 = lean_ctor_get_uint8(x_1, sizeof(void*)*2);
+if (x_5 == 0)
+{
+if (x_2 == 0)
+{
+lean_object* x_6; lean_object* x_7; 
+x_6 = lean_ctor_get(x_1, 1);
+lean_inc(x_6);
+x_7 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_7, 0, x_6);
+return x_7;
+}
+else
+{
+lean_object* x_8; 
+x_8 = lean_box(0);
+return x_8;
+}
+}
+else
+{
+lean_object* x_9; lean_object* x_10; 
+x_9 = lean_ctor_get(x_1, 1);
+lean_inc(x_9);
+x_10 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_10, 0, x_9);
+return x_10;
+}
+}
+default: 
+{
+lean_object* x_11; 
+x_11 = lean_box(0);
+return x_11;
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l_Lean_SourceInfo_getTailPos_x3f___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+uint8_t x_3; lean_object* x_4; 
+x_3 = lean_unbox(x_2);
+lean_dec(x_2);
+x_4 = l_Lean_SourceInfo_getTailPos_x3f(x_1, x_3);
+lean_dec(x_1);
+return x_4;
+}
+}
 LEAN_EXPORT lean_object* l_Lean_Syntax_node1(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {

stage0/stdlib/Lean/Attributes.c

@@ -49,6 +49,7 @@ uint8_t lean_usize_dec_le(size_t, size_t);
 static lean_object* l_Lean_registerParametricAttribute___rarg___closed__4;
 LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_foldlM___at_Lean_updateEnvAttributesImpl___spec__1(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_registerEnumAttributes___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+uint8_t l_Lean_Exception_isInterrupt(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_getAttributeImpl___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_registerParametricAttribute___rarg___lambda__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_getAttributeNames___boxed(lean_object*);
@@ -2579,7 +2580,7 @@ return x_9;
 }
 else
 {
-lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; uint8_t x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; 
+lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; uint8_t x_21; lean_object* x_22; uint8_t x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; 
 x_10 = lean_ctor_get(x_3, 0);
 x_11 = lean_ctor_get(x_3, 1);
 x_12 = lean_ctor_get(x_3, 2);
@@ -2591,7 +2592,10 @@ x_17 = lean_ctor_get(x_3, 7);
 x_18 = lean_ctor_get(x_3, 8);
 x_19 = lean_ctor_get(x_3, 9);
 x_20 = lean_ctor_get(x_3, 10);
-x_21 = lean_ctor_get_uint8(x_3, sizeof(void*)*11);
+x_21 = lean_ctor_get_uint8(x_3, sizeof(void*)*12);
+x_22 = lean_ctor_get(x_3, 11);
+x_23 = lean_ctor_get_uint8(x_3, sizeof(void*)*12 + 1);
+lean_inc(x_22);
 lean_inc(x_20);
 lean_inc(x_19);
 lean_inc(x_18);
@@ -2604,24 +2608,26 @@ lean_inc(x_12);
 lean_inc(x_11);
 lean_inc(x_10);
 lean_dec(x_3);
-x_22 = l_Lean_replaceRef(x_1, x_15);
+x_24 = l_Lean_replaceRef(x_1, x_15);
 lean_dec(x_15);
-x_23 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_23, 0, x_10);
-lean_ctor_set(x_23, 1, x_11);
-lean_ctor_set(x_23, 2, x_12);
-lean_ctor_set(x_23, 3, x_13);
-lean_ctor_set(x_23, 4, x_14);
-lean_ctor_set(x_23, 5, x_22);
-lean_ctor_set(x_23, 6, x_16);
-lean_ctor_set(x_23, 7, x_17);
-lean_ctor_set(x_23, 8, x_18);
-lean_ctor_set(x_23, 9, x_19);
-lean_ctor_set(x_23, 10, x_20);
-lean_ctor_set_uint8(x_23, sizeof(void*)*11, x_21);
-x_24 = l_Lean_throwError___at_Lean_AttributeImpl_erase___default___spec__1(x_2, x_23, x_4, x_5);
-lean_dec(x_23);
-return x_24;
+x_25 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_25, 0, x_10);
+lean_ctor_set(x_25, 1, x_11);
+lean_ctor_set(x_25, 2, x_12);
+lean_ctor_set(x_25, 3, x_13);
+lean_ctor_set(x_25, 4, x_14);
+lean_ctor_set(x_25, 5, x_24);
+lean_ctor_set(x_25, 6, x_16);
+lean_ctor_set(x_25, 7, x_17);
+lean_ctor_set(x_25, 8, x_18);
+lean_ctor_set(x_25, 9, x_19);
+lean_ctor_set(x_25, 10, x_20);
+lean_ctor_set(x_25, 11, x_22);
+lean_ctor_set_uint8(x_25, sizeof(void*)*12, x_21);
+lean_ctor_set_uint8(x_25, sizeof(void*)*12 + 1, x_23);
+x_26 = l_Lean_throwError___at_Lean_AttributeImpl_erase___default___spec__1(x_2, x_25, x_4, x_5);
+lean_dec(x_25);
+return x_26;
 }
 }
 }
@@ -2923,7 +2929,7 @@ return x_9;
 }
 else
 {
-lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; uint8_t x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; 
+lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; uint8_t x_21; lean_object* x_22; uint8_t x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; 
 x_10 = lean_ctor_get(x_3, 0);
 x_11 = lean_ctor_get(x_3, 1);
 x_12 = lean_ctor_get(x_3, 2);
@@ -2935,7 +2941,10 @@ x_17 = lean_ctor_get(x_3, 7);
 x_18 = lean_ctor_get(x_3, 8);
 x_19 = lean_ctor_get(x_3, 9);
 x_20 = lean_ctor_get(x_3, 10);
-x_21 = lean_ctor_get_uint8(x_3, sizeof(void*)*11);
+x_21 = lean_ctor_get_uint8(x_3, sizeof(void*)*12);
+x_22 = lean_ctor_get(x_3, 11);
+x_23 = lean_ctor_get_uint8(x_3, sizeof(void*)*12 + 1);
+lean_inc(x_22);
 lean_inc(x_20);
 lean_inc(x_19);
 lean_inc(x_18);
@@ -2948,26 +2957,28 @@ lean_inc(x_12);
 lean_inc(x_11);
 lean_inc(x_10);
 lean_dec(x_3);
-x_22 = l_Lean_replaceRef(x_1, x_15);
+x_24 = l_Lean_replaceRef(x_1, x_15);
 lean_dec(x_15);
 lean_dec(x_1);
-x_23 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_23, 0, x_10);
-lean_ctor_set(x_23, 1, x_11);
-lean_ctor_set(x_23, 2, x_12);
-lean_ctor_set(x_23, 3, x_13);
-lean_ctor_set(x_23, 4, x_14);
-lean_ctor_set(x_23, 5, x_22);
-lean_ctor_set(x_23, 6, x_16);
-lean_ctor_set(x_23, 7, x_17);
-lean_ctor_set(x_23, 8, x_18);
-lean_ctor_set(x_23, 9, x_19);
-lean_ctor_set(x_23, 10, x_20);
-lean_ctor_set_uint8(x_23, sizeof(void*)*11, x_21);
-x_24 = l_Lean_throwError___at_Lean_Attribute_Builtin_getIdent_x3f___spec__2(x_2, x_23, x_4, x_5);
+x_25 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_25, 0, x_10);
+lean_ctor_set(x_25, 1, x_11);
+lean_ctor_set(x_25, 2, x_12);
+lean_ctor_set(x_25, 3, x_13);
+lean_ctor_set(x_25, 4, x_14);
+lean_ctor_set(x_25, 5, x_24);
+lean_ctor_set(x_25, 6, x_16);
+lean_ctor_set(x_25, 7, x_17);
+lean_ctor_set(x_25, 8, x_18);
+lean_ctor_set(x_25, 9, x_19);
+lean_ctor_set(x_25, 10, x_20);
+lean_ctor_set(x_25, 11, x_22);
+lean_ctor_set_uint8(x_25, sizeof(void*)*12, x_21);
+lean_ctor_set_uint8(x_25, sizeof(void*)*12 + 1, x_23);
+x_26 = l_Lean_throwError___at_Lean_Attribute_Builtin_getIdent_x3f___spec__2(x_2, x_25, x_4, x_5);
 lean_dec(x_4);
-lean_dec(x_23);
-return x_24;
+lean_dec(x_25);
+return x_26;
 }
 }
 }
@@ -3189,7 +3200,7 @@ return x_9;
 }
 else
 {
-lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; uint8_t x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; 
+lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; uint8_t x_21; lean_object* x_22; uint8_t x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; 
 x_10 = lean_ctor_get(x_3, 0);
 x_11 = lean_ctor_get(x_3, 1);
 x_12 = lean_ctor_get(x_3, 2);
@@ -3201,7 +3212,10 @@ x_17 = lean_ctor_get(x_3, 7);
 x_18 = lean_ctor_get(x_3, 8);
 x_19 = lean_ctor_get(x_3, 9);
 x_20 = lean_ctor_get(x_3, 10);
-x_21 = lean_ctor_get_uint8(x_3, sizeof(void*)*11);
+x_21 = lean_ctor_get_uint8(x_3, sizeof(void*)*12);
+x_22 = lean_ctor_get(x_3, 11);
+x_23 = lean_ctor_get_uint8(x_3, sizeof(void*)*12 + 1);
+lean_inc(x_22);
 lean_inc(x_20);
 lean_inc(x_19);
 lean_inc(x_18);
@@ -3214,26 +3228,28 @@ lean_inc(x_12);
 lean_inc(x_11);
 lean_inc(x_10);
 lean_dec(x_3);
-x_22 = l_Lean_replaceRef(x_1, x_15);
+x_24 = l_Lean_replaceRef(x_1, x_15);
 lean_dec(x_15);
 lean_dec(x_1);
-x_23 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_23, 0, x_10);
-lean_ctor_set(x_23, 1, x_11);
-lean_ctor_set(x_23, 2, x_12);
-lean_ctor_set(x_23, 3, x_13);
-lean_ctor_set(x_23, 4, x_14);
-lean_ctor_set(x_23, 5, x_22);
-lean_ctor_set(x_23, 6, x_16);
-lean_ctor_set(x_23, 7, x_17);
-lean_ctor_set(x_23, 8, x_18);
-lean_ctor_set(x_23, 9, x_19);
-lean_ctor_set(x_23, 10, x_20);
-lean_ctor_set_uint8(x_23, sizeof(void*)*11, x_21);
-x_24 = l_Lean_throwError___at_Lean_Attribute_Builtin_getIdent___spec__2(x_2, x_23, x_4, x_5);
+x_25 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_25, 0, x_10);
+lean_ctor_set(x_25, 1, x_11);
+lean_ctor_set(x_25, 2, x_12);
+lean_ctor_set(x_25, 3, x_13);
+lean_ctor_set(x_25, 4, x_14);
+lean_ctor_set(x_25, 5, x_24);
+lean_ctor_set(x_25, 6, x_16);
+lean_ctor_set(x_25, 7, x_17);
+lean_ctor_set(x_25, 8, x_18);
+lean_ctor_set(x_25, 9, x_19);
+lean_ctor_set(x_25, 10, x_20);
+lean_ctor_set(x_25, 11, x_22);
+lean_ctor_set_uint8(x_25, sizeof(void*)*12, x_21);
+lean_ctor_set_uint8(x_25, sizeof(void*)*12 + 1, x_23);
+x_26 = l_Lean_throwError___at_Lean_Attribute_Builtin_getIdent___spec__2(x_2, x_25, x_4, x_5);
 lean_dec(x_4);
-lean_dec(x_23);
-return x_24;
+lean_dec(x_25);
+return x_26;
 }
 }
 }
@@ -3587,7 +3603,7 @@ return x_9;
 }
 else
 {
-lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; uint8_t x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; 
+lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; uint8_t x_21; lean_object* x_22; uint8_t x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; 
 x_10 = lean_ctor_get(x_3, 0);
 x_11 = lean_ctor_get(x_3, 1);
 x_12 = lean_ctor_get(x_3, 2);
@@ -3599,7 +3615,10 @@ x_17 = lean_ctor_get(x_3, 7);
 x_18 = lean_ctor_get(x_3, 8);
 x_19 = lean_ctor_get(x_3, 9);
 x_20 = lean_ctor_get(x_3, 10);
-x_21 = lean_ctor_get_uint8(x_3, sizeof(void*)*11);
+x_21 = lean_ctor_get_uint8(x_3, sizeof(void*)*12);
+x_22 = lean_ctor_get(x_3, 11);
+x_23 = lean_ctor_get_uint8(x_3, sizeof(void*)*12 + 1);
+lean_inc(x_22);
 lean_inc(x_20);
 lean_inc(x_19);
 lean_inc(x_18);
@@ -3612,26 +3631,28 @@ lean_inc(x_12);
 lean_inc(x_11);
 lean_inc(x_10);
 lean_dec(x_3);
-x_22 = l_Lean_replaceRef(x_1, x_15);
+x_24 = l_Lean_replaceRef(x_1, x_15);
 lean_dec(x_15);
 lean_dec(x_1);
-x_23 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_23, 0, x_10);
-lean_ctor_set(x_23, 1, x_11);
-lean_ctor_set(x_23, 2, x_12);
-lean_ctor_set(x_23, 3, x_13);
-lean_ctor_set(x_23, 4, x_14);
-lean_ctor_set(x_23, 5, x_22);
-lean_ctor_set(x_23, 6, x_16);
-lean_ctor_set(x_23, 7, x_17);
-lean_ctor_set(x_23, 8, x_18);
-lean_ctor_set(x_23, 9, x_19);
-lean_ctor_set(x_23, 10, x_20);
-lean_ctor_set_uint8(x_23, sizeof(void*)*11, x_21);
-x_24 = l_Lean_throwError___at_Lean_getAttrParamOptPrio___spec__2(x_2, x_23, x_4, x_5);
+x_25 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_25, 0, x_10);
+lean_ctor_set(x_25, 1, x_11);
+lean_ctor_set(x_25, 2, x_12);
+lean_ctor_set(x_25, 3, x_13);
+lean_ctor_set(x_25, 4, x_14);
+lean_ctor_set(x_25, 5, x_24);
+lean_ctor_set(x_25, 6, x_16);
+lean_ctor_set(x_25, 7, x_17);
+lean_ctor_set(x_25, 8, x_18);
+lean_ctor_set(x_25, 9, x_19);
+lean_ctor_set(x_25, 10, x_20);
+lean_ctor_set(x_25, 11, x_22);
+lean_ctor_set_uint8(x_25, sizeof(void*)*12, x_21);
+lean_ctor_set_uint8(x_25, sizeof(void*)*12 + 1, x_23);
+x_26 = l_Lean_throwError___at_Lean_getAttrParamOptPrio___spec__2(x_2, x_25, x_4, x_5);
 lean_dec(x_4);
-lean_dec(x_23);
-return x_24;
+lean_dec(x_25);
+return x_26;
 }
 }
 }
@@ -5309,16 +5330,20 @@ if (x_26 == 0)
 lean_object* x_27; lean_object* x_28; uint8_t x_29; 
 x_27 = lean_ctor_get(x_25, 0);
 x_28 = lean_ctor_get(x_25, 1);
-x_29 = l_Lean_Exception_isRuntime(x_27);
+x_29 = l_Lean_Exception_isInterrupt(x_27);
 if (x_29 == 0)
 {
-lean_object* x_30; 
+uint8_t x_30; 
+x_30 = l_Lean_Exception_isRuntime(x_27);
+if (x_30 == 0)
+{
+lean_object* x_31; 
 lean_free_object(x_25);
 lean_dec(x_27);
-x_30 = l_Lean_setEnv___at_Lean_registerParametricAttribute___spec__3(x_6, x_8, x_9, x_28);
+x_31 = l_Lean_setEnv___at_Lean_registerParametricAttribute___spec__3(x_6, x_8, x_9, x_28);
 lean_dec(x_9);
 lean_dec(x_8);
-return x_30;
+return x_31;
 }
 else
 {
@@ -5330,261 +5355,325 @@ return x_25;
 }
 else
 {
-lean_object* x_31; lean_object* x_32; uint8_t x_33; 
-x_31 = lean_ctor_get(x_25, 0);
-x_32 = lean_ctor_get(x_25, 1);
-lean_inc(x_32);
-lean_inc(x_31);
-lean_dec(x_25);
-x_33 = l_Lean_Exception_isRuntime(x_31);
-if (x_33 == 0)
-{
-lean_object* x_34; 
-lean_dec(x_31);
-x_34 = l_Lean_setEnv___at_Lean_registerParametricAttribute___spec__3(x_6, x_8, x_9, x_32);
-lean_dec(x_9);
-lean_dec(x_8);
-return x_34;
-}
-else
-{
-lean_object* x_35; 
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_6);
-x_35 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_35, 0, x_31);
-lean_ctor_set(x_35, 1, x_32);
-return x_35;
+return x_25;
+}
+}
+else
+{
+lean_object* x_32; lean_object* x_33; uint8_t x_34; 
+x_32 = lean_ctor_get(x_25, 0);
+x_33 = lean_ctor_get(x_25, 1);
+lean_inc(x_33);
+lean_inc(x_32);
+lean_dec(x_25);
+x_34 = l_Lean_Exception_isInterrupt(x_32);
+if (x_34 == 0)
+{
+uint8_t x_35; 
+x_35 = l_Lean_Exception_isRuntime(x_32);
+if (x_35 == 0)
+{
+lean_object* x_36; 
+lean_dec(x_32);
+x_36 = l_Lean_setEnv___at_Lean_registerParametricAttribute___spec__3(x_6, x_8, x_9, x_33);
+lean_dec(x_9);
+lean_dec(x_8);
+return x_36;
+}
+else
+{
+lean_object* x_37; 
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_6);
+x_37 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_37, 0, x_32);
+lean_ctor_set(x_37, 1, x_33);
+return x_37;
+}
+}
+else
+{
+lean_object* x_38; 
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_6);
+x_38 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_38, 0, x_32);
+lean_ctor_set(x_38, 1, x_33);
+return x_38;
 }
 }
 }
 }
 else
 {
-lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; 
-x_36 = lean_ctor_get(x_14, 1);
-x_37 = lean_ctor_get(x_16, 0);
-x_38 = lean_ctor_get(x_16, 1);
-x_39 = lean_ctor_get(x_16, 2);
-x_40 = lean_ctor_get(x_16, 3);
-x_41 = lean_ctor_get(x_16, 5);
-x_42 = lean_ctor_get(x_16, 6);
+lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; 
+x_39 = lean_ctor_get(x_14, 1);
+x_40 = lean_ctor_get(x_16, 0);
+x_41 = lean_ctor_get(x_16, 1);
+x_42 = lean_ctor_get(x_16, 2);
+x_43 = lean_ctor_get(x_16, 3);
+x_44 = lean_ctor_get(x_16, 5);
+x_45 = lean_ctor_get(x_16, 6);
+lean_inc(x_45);
+lean_inc(x_44);
+lean_inc(x_43);
 lean_inc(x_42);
 lean_inc(x_41);
 lean_inc(x_40);
-lean_inc(x_39);
-lean_inc(x_38);
-lean_inc(x_37);
 lean_dec(x_16);
 lean_inc(x_12);
 lean_inc(x_2);
 lean_ctor_set(x_14, 1, x_12);
 lean_ctor_set(x_14, 0, x_2);
-x_43 = l_Lean_PersistentEnvExtension_addEntry___rarg(x_4, x_37, x_14);
-x_44 = l_Lean_registerTagAttribute___lambda__5___closed__1;
-x_45 = lean_alloc_ctor(0, 7, 0);
-lean_ctor_set(x_45, 0, x_43);
-lean_ctor_set(x_45, 1, x_38);
-lean_ctor_set(x_45, 2, x_39);
-lean_ctor_set(x_45, 3, x_40);
-lean_ctor_set(x_45, 4, x_44);
-lean_ctor_set(x_45, 5, x_41);
-lean_ctor_set(x_45, 6, x_42);
-x_46 = lean_st_ref_set(x_9, x_45, x_36);
-x_47 = lean_ctor_get(x_46, 1);
-lean_inc(x_47);
-lean_dec(x_46);
+x_46 = l_Lean_PersistentEnvExtension_addEntry___rarg(x_4, x_40, x_14);
+x_47 = l_Lean_registerTagAttribute___lambda__5___closed__1;
+x_48 = lean_alloc_ctor(0, 7, 0);
+lean_ctor_set(x_48, 0, x_46);
+lean_ctor_set(x_48, 1, x_41);
+lean_ctor_set(x_48, 2, x_42);
+lean_ctor_set(x_48, 3, x_43);
+lean_ctor_set(x_48, 4, x_47);
+lean_ctor_set(x_48, 5, x_44);
+lean_ctor_set(x_48, 6, x_45);
+x_49 = lean_st_ref_set(x_9, x_48, x_39);
+x_50 = lean_ctor_get(x_49, 1);
+lean_inc(x_50);
+lean_dec(x_49);
 lean_inc(x_9);
 lean_inc(x_8);
-x_48 = lean_apply_5(x_5, x_2, x_12, x_8, x_9, x_47);
-if (lean_obj_tag(x_48) == 0)
+x_51 = lean_apply_5(x_5, x_2, x_12, x_8, x_9, x_50);
+if (lean_obj_tag(x_51) == 0)
 {
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_6);
-return x_48;
+return x_51;
 }
 else
 {
-lean_object* x_49; lean_object* x_50; lean_object* x_51; uint8_t x_52; 
-x_49 = lean_ctor_get(x_48, 0);
-lean_inc(x_49);
-x_50 = lean_ctor_get(x_48, 1);
-lean_inc(x_50);
-if (lean_is_exclusive(x_48)) {
- lean_ctor_release(x_48, 0);
- lean_ctor_release(x_48, 1);
- x_51 = x_48;
-} else {
- lean_dec_ref(x_48);
- x_51 = lean_box(0);
-}
-x_52 = l_Lean_Exception_isRuntime(x_49);
-if (x_52 == 0)
-{
-lean_object* x_53; 
-lean_dec(x_51);
-lean_dec(x_49);
-x_53 = l_Lean_setEnv___at_Lean_registerParametricAttribute___spec__3(x_6, x_8, x_9, x_50);
-lean_dec(x_9);
-lean_dec(x_8);
-return x_53;
-}
-else
-{
-lean_object* x_54; 
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_6);
-if (lean_is_scalar(x_51)) {
- x_54 = lean_alloc_ctor(1, 2, 0);
-} else {
+lean_object* x_52; lean_object* x_53; lean_object* x_54; uint8_t x_55; 
+x_52 = lean_ctor_get(x_51, 0);
+lean_inc(x_52);
+x_53 = lean_ctor_get(x_51, 1);
+lean_inc(x_53);
+if (lean_is_exclusive(x_51)) {
+ lean_ctor_release(x_51, 0);
+ lean_ctor_release(x_51, 1);
  x_54 = x_51;
+} else {
+ lean_dec_ref(x_51);
+ x_54 = lean_box(0);
 }
-lean_ctor_set(x_54, 0, x_49);
-lean_ctor_set(x_54, 1, x_50);
-return x_54;
+x_55 = l_Lean_Exception_isInterrupt(x_52);
+if (x_55 == 0)
+{
+uint8_t x_56; 
+x_56 = l_Lean_Exception_isRuntime(x_52);
+if (x_56 == 0)
+{
+lean_object* x_57; 
+lean_dec(x_54);
+lean_dec(x_52);
+x_57 = l_Lean_setEnv___at_Lean_registerParametricAttribute___spec__3(x_6, x_8, x_9, x_53);
+lean_dec(x_9);
+lean_dec(x_8);
+return x_57;
+}
+else
+{
+lean_object* x_58; 
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_6);
+if (lean_is_scalar(x_54)) {
+ x_58 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_58 = x_54;
+}
+lean_ctor_set(x_58, 0, x_52);
+lean_ctor_set(x_58, 1, x_53);
+return x_58;
+}
+}
+else
+{
+lean_object* x_59; 
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_6);
+if (lean_is_scalar(x_54)) {
+ x_59 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_59 = x_54;
+}
+lean_ctor_set(x_59, 0, x_52);
+lean_ctor_set(x_59, 1, x_53);
+return x_59;
 }
 }
 }
 }
 else
 {
-lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; 
-x_55 = lean_ctor_get(x_14, 0);
-x_56 = lean_ctor_get(x_14, 1);
-lean_inc(x_56);
-lean_inc(x_55);
-lean_dec(x_14);
-x_57 = lean_ctor_get(x_55, 0);
-lean_inc(x_57);
-x_58 = lean_ctor_get(x_55, 1);
-lean_inc(x_58);
-x_59 = lean_ctor_get(x_55, 2);
-lean_inc(x_59);
-x_60 = lean_ctor_get(x_55, 3);
-lean_inc(x_60);
-x_61 = lean_ctor_get(x_55, 5);
+lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; 
+x_60 = lean_ctor_get(x_14, 0);
+x_61 = lean_ctor_get(x_14, 1);
 lean_inc(x_61);
-x_62 = lean_ctor_get(x_55, 6);
+lean_inc(x_60);
+lean_dec(x_14);
+x_62 = lean_ctor_get(x_60, 0);
 lean_inc(x_62);
-if (lean_is_exclusive(x_55)) {
- lean_ctor_release(x_55, 0);
- lean_ctor_release(x_55, 1);
- lean_ctor_release(x_55, 2);
- lean_ctor_release(x_55, 3);
- lean_ctor_release(x_55, 4);
- lean_ctor_release(x_55, 5);
- lean_ctor_release(x_55, 6);
- x_63 = x_55;
+x_63 = lean_ctor_get(x_60, 1);
+lean_inc(x_63);
+x_64 = lean_ctor_get(x_60, 2);
+lean_inc(x_64);
+x_65 = lean_ctor_get(x_60, 3);
+lean_inc(x_65);
+x_66 = lean_ctor_get(x_60, 5);
+lean_inc(x_66);
+x_67 = lean_ctor_get(x_60, 6);
+lean_inc(x_67);
+if (lean_is_exclusive(x_60)) {
+ lean_ctor_release(x_60, 0);
+ lean_ctor_release(x_60, 1);
+ lean_ctor_release(x_60, 2);
+ lean_ctor_release(x_60, 3);
+ lean_ctor_release(x_60, 4);
+ lean_ctor_release(x_60, 5);
+ lean_ctor_release(x_60, 6);
+ x_68 = x_60;
 } else {
- lean_dec_ref(x_55);
- x_63 = lean_box(0);
+ lean_dec_ref(x_60);
+ x_68 = lean_box(0);
 }
 lean_inc(x_12);
 lean_inc(x_2);
-x_64 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_64, 0, x_2);
-lean_ctor_set(x_64, 1, x_12);
-x_65 = l_Lean_PersistentEnvExtension_addEntry___rarg(x_4, x_57, x_64);
-x_66 = l_Lean_registerTagAttribute___lambda__5___closed__1;
-if (lean_is_scalar(x_63)) {
- x_67 = lean_alloc_ctor(0, 7, 0);
+x_69 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_69, 0, x_2);
+lean_ctor_set(x_69, 1, x_12);
+x_70 = l_Lean_PersistentEnvExtension_addEntry___rarg(x_4, x_62, x_69);
+x_71 = l_Lean_registerTagAttribute___lambda__5___closed__1;
+if (lean_is_scalar(x_68)) {
+ x_72 = lean_alloc_ctor(0, 7, 0);
 } else {
- x_67 = x_63;
+ x_72 = x_68;
 }
-lean_ctor_set(x_67, 0, x_65);
-lean_ctor_set(x_67, 1, x_58);
-lean_ctor_set(x_67, 2, x_59);
-lean_ctor_set(x_67, 3, x_60);
-lean_ctor_set(x_67, 4, x_66);
-lean_ctor_set(x_67, 5, x_61);
-lean_ctor_set(x_67, 6, x_62);
-x_68 = lean_st_ref_set(x_9, x_67, x_56);
-x_69 = lean_ctor_get(x_68, 1);
-lean_inc(x_69);
-lean_dec(x_68);
+lean_ctor_set(x_72, 0, x_70);
+lean_ctor_set(x_72, 1, x_63);
+lean_ctor_set(x_72, 2, x_64);
+lean_ctor_set(x_72, 3, x_65);
+lean_ctor_set(x_72, 4, x_71);
+lean_ctor_set(x_72, 5, x_66);
+lean_ctor_set(x_72, 6, x_67);
+x_73 = lean_st_ref_set(x_9, x_72, x_61);
+x_74 = lean_ctor_get(x_73, 1);
+lean_inc(x_74);
+lean_dec(x_73);
 lean_inc(x_9);
 lean_inc(x_8);
-x_70 = lean_apply_5(x_5, x_2, x_12, x_8, x_9, x_69);
-if (lean_obj_tag(x_70) == 0)
+x_75 = lean_apply_5(x_5, x_2, x_12, x_8, x_9, x_74);
+if (lean_obj_tag(x_75) == 0)
 {
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_6);
-return x_70;
-}
-else
-{
-lean_object* x_71; lean_object* x_72; lean_object* x_73; uint8_t x_74; 
-x_71 = lean_ctor_get(x_70, 0);
-lean_inc(x_71);
-x_72 = lean_ctor_get(x_70, 1);
-lean_inc(x_72);
-if (lean_is_exclusive(x_70)) {
- lean_ctor_release(x_70, 0);
- lean_ctor_release(x_70, 1);
- x_73 = x_70;
-} else {
- lean_dec_ref(x_70);
- x_73 = lean_box(0);
-}
-x_74 = l_Lean_Exception_isRuntime(x_71);
-if (x_74 == 0)
-{
-lean_object* x_75; 
-lean_dec(x_73);
-lean_dec(x_71);
-x_75 = l_Lean_setEnv___at_Lean_registerParametricAttribute___spec__3(x_6, x_8, x_9, x_72);
-lean_dec(x_9);
-lean_dec(x_8);
 return x_75;
 }
 else
 {
-lean_object* x_76; 
+lean_object* x_76; lean_object* x_77; lean_object* x_78; uint8_t x_79; 
+x_76 = lean_ctor_get(x_75, 0);
+lean_inc(x_76);
+x_77 = lean_ctor_get(x_75, 1);
+lean_inc(x_77);
+if (lean_is_exclusive(x_75)) {
+ lean_ctor_release(x_75, 0);
+ lean_ctor_release(x_75, 1);
+ x_78 = x_75;
+} else {
+ lean_dec_ref(x_75);
+ x_78 = lean_box(0);
+}
+x_79 = l_Lean_Exception_isInterrupt(x_76);
+if (x_79 == 0)
+{
+uint8_t x_80; 
+x_80 = l_Lean_Exception_isRuntime(x_76);
+if (x_80 == 0)
+{
+lean_object* x_81; 
+lean_dec(x_78);
+lean_dec(x_76);
+x_81 = l_Lean_setEnv___at_Lean_registerParametricAttribute___spec__3(x_6, x_8, x_9, x_77);
+lean_dec(x_9);
+lean_dec(x_8);
+return x_81;
+}
+else
+{
+lean_object* x_82; 
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_6);
-if (lean_is_scalar(x_73)) {
- x_76 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_78)) {
+ x_82 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_76 = x_73;
+ x_82 = x_78;
 }
-lean_ctor_set(x_76, 0, x_71);
-lean_ctor_set(x_76, 1, x_72);
-return x_76;
+lean_ctor_set(x_82, 0, x_76);
+lean_ctor_set(x_82, 1, x_77);
+return x_82;
+}
+}
+else
+{
+lean_object* x_83; 
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_6);
+if (lean_is_scalar(x_78)) {
+ x_83 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_83 = x_78;
+}
+lean_ctor_set(x_83, 0, x_76);
+lean_ctor_set(x_83, 1, x_77);
+return x_83;
 }
 }
 }
 }
 else
 {
-uint8_t x_77; 
+uint8_t x_84; 
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_2);
-x_77 = !lean_is_exclusive(x_11);
-if (x_77 == 0)
+x_84 = !lean_is_exclusive(x_11);
+if (x_84 == 0)
 {
 return x_11;
 }
 else
 {
-lean_object* x_78; lean_object* x_79; lean_object* x_80; 
-x_78 = lean_ctor_get(x_11, 0);
-x_79 = lean_ctor_get(x_11, 1);
-lean_inc(x_79);
-lean_inc(x_78);
+lean_object* x_85; lean_object* x_86; lean_object* x_87; 
+x_85 = lean_ctor_get(x_11, 0);
+x_86 = lean_ctor_get(x_11, 1);
+lean_inc(x_86);
+lean_inc(x_85);
 lean_dec(x_11);
-x_80 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_80, 0, x_78);
-lean_ctor_set(x_80, 1, x_79);
-return x_80;
+x_87 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_87, 0, x_85);
+lean_ctor_set(x_87, 1, x_86);
+return x_87;
 }
 }
 }

stage0/stdlib/Lean/Compiler/ExternAttr.c

@@ -70,7 +70,7 @@ LEAN_EXPORT lean_object* lean_get_extern_attr_data(lean_object*, lean_object*);
 size_t lean_usize_of_nat(lean_object*);
 static lean_object* l_Lean_getExternConstArityExport___closed__2;
 uint8_t l_instDecidableNot___rarg(uint8_t);
-static uint8_t l_Lean_getExternConstArityExport___closed__12;
+static lean_object* l_Lean_getExternConstArityExport___closed__12;
 lean_object* lean_st_ref_take(lean_object*, lean_object*);
 lean_object* l_Lean_getConstInfo___at___private_Lean_Compiler_InlineAttrs_0__Lean_Compiler_isValidMacroInline___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
@@ -163,6 +163,7 @@ static lean_object* l___private_Lean_Compiler_ExternAttr_0__Lean_syntaxToExternA
 extern lean_object* l_Lean_firstFrontendMacroScope;
 lean_object* l_Lean_ofExcept___at_Lean_initFn____x40_Lean_Class___hyg_768____spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_getExternConstArityExport___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static uint8_t l_Lean_getExternConstArityExport___closed__13;
 size_t lean_usize_add(size_t, size_t);
 LEAN_EXPORT lean_object* l_Lean_expandExternPattern___boxed(lean_object*, lean_object*);
 static lean_object* l_Lean_initFn____x40_Lean_Compiler_ExternAttr___hyg_690____closed__7;
@@ -289,7 +290,7 @@ return x_9;
 }
 else
 {
-lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; uint8_t x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; 
+lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; uint8_t x_21; lean_object* x_22; uint8_t x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; 
 x_10 = lean_ctor_get(x_3, 0);
 x_11 = lean_ctor_get(x_3, 1);
 x_12 = lean_ctor_get(x_3, 2);
@@ -301,7 +302,10 @@ x_17 = lean_ctor_get(x_3, 7);
 x_18 = lean_ctor_get(x_3, 8);
 x_19 = lean_ctor_get(x_3, 9);
 x_20 = lean_ctor_get(x_3, 10);
-x_21 = lean_ctor_get_uint8(x_3, sizeof(void*)*11);
+x_21 = lean_ctor_get_uint8(x_3, sizeof(void*)*12);
+x_22 = lean_ctor_get(x_3, 11);
+x_23 = lean_ctor_get_uint8(x_3, sizeof(void*)*12 + 1);
+lean_inc(x_22);
 lean_inc(x_20);
 lean_inc(x_19);
 lean_inc(x_18);
@@ -314,26 +318,28 @@ lean_inc(x_12);
 lean_inc(x_11);
 lean_inc(x_10);
 lean_dec(x_3);
-x_22 = l_Lean_replaceRef(x_1, x_15);
+x_24 = l_Lean_replaceRef(x_1, x_15);
 lean_dec(x_15);
 lean_dec(x_1);
-x_23 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_23, 0, x_10);
-lean_ctor_set(x_23, 1, x_11);
-lean_ctor_set(x_23, 2, x_12);
-lean_ctor_set(x_23, 3, x_13);
-lean_ctor_set(x_23, 4, x_14);
-lean_ctor_set(x_23, 5, x_22);
-lean_ctor_set(x_23, 6, x_16);
-lean_ctor_set(x_23, 7, x_17);
-lean_ctor_set(x_23, 8, x_18);
-lean_ctor_set(x_23, 9, x_19);
-lean_ctor_set(x_23, 10, x_20);
-lean_ctor_set_uint8(x_23, sizeof(void*)*11, x_21);
-x_24 = l_Lean_throwError___at___private_Lean_Compiler_ExternAttr_0__Lean_syntaxToExternAttrData___spec__2(x_2, x_23, x_4, x_5);
+x_25 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_25, 0, x_10);
+lean_ctor_set(x_25, 1, x_11);
+lean_ctor_set(x_25, 2, x_12);
+lean_ctor_set(x_25, 3, x_13);
+lean_ctor_set(x_25, 4, x_14);
+lean_ctor_set(x_25, 5, x_24);
+lean_ctor_set(x_25, 6, x_16);
+lean_ctor_set(x_25, 7, x_17);
+lean_ctor_set(x_25, 8, x_18);
+lean_ctor_set(x_25, 9, x_19);
+lean_ctor_set(x_25, 10, x_20);
+lean_ctor_set(x_25, 11, x_22);
+lean_ctor_set_uint8(x_25, sizeof(void*)*12, x_21);
+lean_ctor_set_uint8(x_25, sizeof(void*)*12 + 1, x_23);
+x_26 = l_Lean_throwError___at___private_Lean_Compiler_ExternAttr_0__Lean_syntaxToExternAttrData___spec__2(x_2, x_25, x_4, x_5);
 lean_dec(x_4);
-lean_dec(x_23);
-return x_24;
+lean_dec(x_25);
+return x_26;
 }
 }
 }
@@ -2899,13 +2905,13 @@ x_11 = l_Lean_getExternConstArityExport___lambda__1___closed__1;
 x_12 = l_Lean_Option_get___at_Lean_profiler_threshold_getSecs___spec__1(x_1, x_11);
 lean_ctor_set(x_5, 4, x_12);
 lean_ctor_set(x_5, 2, x_1);
-lean_ctor_set_uint8(x_5, sizeof(void*)*11, x_2);
+lean_ctor_set_uint8(x_5, sizeof(void*)*12, x_2);
 x_13 = l___private_Lean_Compiler_ExternAttr_0__Lean_getExternConstArity(x_3, x_5, x_6, x_7);
 return x_13;
 }
 else
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; 
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; uint8_t x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; 
 x_14 = lean_ctor_get(x_5, 0);
 x_15 = lean_ctor_get(x_5, 1);
 x_16 = lean_ctor_get(x_5, 3);
@@ -2915,6 +2921,9 @@ x_19 = lean_ctor_get(x_5, 7);
 x_20 = lean_ctor_get(x_5, 8);
 x_21 = lean_ctor_get(x_5, 9);
 x_22 = lean_ctor_get(x_5, 10);
+x_23 = lean_ctor_get(x_5, 11);
+x_24 = lean_ctor_get_uint8(x_5, sizeof(void*)*12 + 1);
+lean_inc(x_23);
 lean_inc(x_22);
 lean_inc(x_21);
 lean_inc(x_20);
@@ -2925,23 +2934,25 @@ lean_inc(x_16);
 lean_inc(x_15);
 lean_inc(x_14);
 lean_dec(x_5);
-x_23 = l_Lean_getExternConstArityExport___lambda__1___closed__1;
-x_24 = l_Lean_Option_get___at_Lean_profiler_threshold_getSecs___spec__1(x_1, x_23);
-x_25 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_25, 0, x_14);
-lean_ctor_set(x_25, 1, x_15);
-lean_ctor_set(x_25, 2, x_1);
-lean_ctor_set(x_25, 3, x_16);
-lean_ctor_set(x_25, 4, x_24);
-lean_ctor_set(x_25, 5, x_17);
-lean_ctor_set(x_25, 6, x_18);
-lean_ctor_set(x_25, 7, x_19);
-lean_ctor_set(x_25, 8, x_20);
-lean_ctor_set(x_25, 9, x_21);
-lean_ctor_set(x_25, 10, x_22);
-lean_ctor_set_uint8(x_25, sizeof(void*)*11, x_2);
-x_26 = l___private_Lean_Compiler_ExternAttr_0__Lean_getExternConstArity(x_3, x_25, x_6, x_7);
-return x_26;
+x_25 = l_Lean_getExternConstArityExport___lambda__1___closed__1;
+x_26 = l_Lean_Option_get___at_Lean_profiler_threshold_getSecs___spec__1(x_1, x_25);
+x_27 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_27, 0, x_14);
+lean_ctor_set(x_27, 1, x_15);
+lean_ctor_set(x_27, 2, x_1);
+lean_ctor_set(x_27, 3, x_16);
+lean_ctor_set(x_27, 4, x_26);
+lean_ctor_set(x_27, 5, x_17);
+lean_ctor_set(x_27, 6, x_18);
+lean_ctor_set(x_27, 7, x_19);
+lean_ctor_set(x_27, 8, x_20);
+lean_ctor_set(x_27, 9, x_21);
+lean_ctor_set(x_27, 10, x_22);
+lean_ctor_set(x_27, 11, x_23);
+lean_ctor_set_uint8(x_27, sizeof(void*)*12, x_2);
+lean_ctor_set_uint8(x_27, sizeof(void*)*12 + 1, x_24);
+x_28 = l___private_Lean_Compiler_ExternAttr_0__Lean_getExternConstArity(x_3, x_27, x_6, x_7);
+return x_28;
 }
 }
 }
@@ -3028,6 +3039,18 @@ return x_2;
 static lean_object* _init_l_Lean_getExternConstArityExport___closed__9() {
 _start:
 {
+uint8_t x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = 0;
+x_2 = l___private_Lean_Compiler_ExternAttr_0__Lean_getExternConstArity___closed__7;
+x_3 = lean_alloc_ctor(0, 1, 1);
+lean_ctor_set(x_3, 0, x_2);
+lean_ctor_set_uint8(x_3, sizeof(void*)*1, x_1);
+return x_3;
+}
+}
+static lean_object* _init_l_Lean_getExternConstArityExport___closed__10() {
+_start:
+{
 uint8_t x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = 1;
 x_2 = l___private_Lean_Compiler_ExternAttr_0__Lean_getExternConstArity___closed__11;
@@ -3039,7 +3062,7 @@ lean_ctor_set_uint8(x_4, sizeof(void*)*2, x_1);
 return x_4;
 }
 }
-static lean_object* _init_l_Lean_getExternConstArityExport___closed__10() {
+static lean_object* _init_l_Lean_getExternConstArityExport___closed__11() {
 _start:
 {
 lean_object* x_1; 
@@ -3047,7 +3070,7 @@ x_1 = lean_mk_string_from_bytes("<compiler>", 10);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_getExternConstArityExport___closed__11() {
+static lean_object* _init_l_Lean_getExternConstArityExport___closed__12() {
 _start:
 {
 lean_object* x_1; 
@@ -3055,12 +3078,12 @@ x_1 = l_Lean_diagnostics;
 return x_1;
 }
 }
-static uint8_t _init_l_Lean_getExternConstArityExport___closed__12() {
+static uint8_t _init_l_Lean_getExternConstArityExport___closed__13() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; uint8_t x_3; 
 x_1 = lean_box(0);
-x_2 = l_Lean_getExternConstArityExport___closed__11;
+x_2 = l_Lean_getExternConstArityExport___closed__12;
 x_3 = l_Lean_Option_get___at___private_Lean_Util_Profile_0__Lean_get__profiler___spec__1(x_1, x_2);
 return x_3;
 }
@@ -3068,98 +3091,102 @@ return x_3;
 LEAN_EXPORT lean_object* lean_get_extern_const_arity(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
-lean_object* x_4; lean_object* x_21; lean_object* x_22; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; uint8_t x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; uint8_t x_77; uint8_t x_78; 
+lean_object* x_4; lean_object* x_21; lean_object* x_22; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; uint8_t x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; uint8_t x_79; uint8_t x_80; 
 x_50 = lean_box(0);
-x_51 = l_Lean_getExternConstArityExport___closed__4;
-x_52 = l_Lean_getExternConstArityExport___closed__7;
-x_53 = l___private_Lean_Compiler_ExternAttr_0__Lean_getExternConstArity___closed__7;
-x_54 = l_Lean_getExternConstArityExport___closed__8;
-x_55 = l_Lean_getExternConstArityExport___closed__9;
-x_56 = lean_alloc_ctor(0, 7, 0);
-lean_ctor_set(x_56, 0, x_1);
-lean_ctor_set(x_56, 1, x_51);
-lean_ctor_set(x_56, 2, x_52);
-lean_ctor_set(x_56, 3, x_53);
-lean_ctor_set(x_56, 4, x_54);
-lean_ctor_set(x_56, 5, x_53);
-lean_ctor_set(x_56, 6, x_55);
-x_57 = lean_io_get_num_heartbeats(x_3);
-x_58 = lean_ctor_get(x_57, 0);
-lean_inc(x_58);
-x_59 = lean_ctor_get(x_57, 1);
-lean_inc(x_59);
-lean_dec(x_57);
-x_60 = l_Lean_getExternConstArityExport___closed__10;
-x_61 = l_Lean_getExternConstArityExport___closed__2;
-x_62 = lean_unsigned_to_nat(0u);
-x_63 = lean_unsigned_to_nat(1000u);
-x_64 = lean_box(0);
-x_65 = lean_box(0);
-x_66 = l_Lean_getExternConstArityExport___closed__3;
-x_67 = l_Lean_firstFrontendMacroScope;
-x_68 = 0;
-x_69 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_69, 0, x_60);
-lean_ctor_set(x_69, 1, x_61);
-lean_ctor_set(x_69, 2, x_50);
-lean_ctor_set(x_69, 3, x_62);
-lean_ctor_set(x_69, 4, x_63);
-lean_ctor_set(x_69, 5, x_64);
-lean_ctor_set(x_69, 6, x_65);
-lean_ctor_set(x_69, 7, x_50);
-lean_ctor_set(x_69, 8, x_58);
-lean_ctor_set(x_69, 9, x_66);
-lean_ctor_set(x_69, 10, x_67);
-lean_ctor_set_uint8(x_69, sizeof(void*)*11, x_68);
-x_70 = lean_st_mk_ref(x_56, x_59);
-x_71 = lean_ctor_get(x_70, 0);
-lean_inc(x_71);
-x_72 = lean_ctor_get(x_70, 1);
-lean_inc(x_72);
-lean_dec(x_70);
-x_73 = lean_st_ref_get(x_71, x_72);
-x_74 = lean_ctor_get(x_73, 0);
+x_51 = lean_box(0);
+x_52 = l_Lean_getExternConstArityExport___closed__4;
+x_53 = l_Lean_getExternConstArityExport___closed__7;
+x_54 = l___private_Lean_Compiler_ExternAttr_0__Lean_getExternConstArity___closed__7;
+x_55 = l_Lean_getExternConstArityExport___closed__8;
+x_56 = l_Lean_getExternConstArityExport___closed__9;
+x_57 = l_Lean_getExternConstArityExport___closed__10;
+x_58 = lean_alloc_ctor(0, 7, 0);
+lean_ctor_set(x_58, 0, x_1);
+lean_ctor_set(x_58, 1, x_52);
+lean_ctor_set(x_58, 2, x_53);
+lean_ctor_set(x_58, 3, x_54);
+lean_ctor_set(x_58, 4, x_55);
+lean_ctor_set(x_58, 5, x_56);
+lean_ctor_set(x_58, 6, x_57);
+x_59 = lean_io_get_num_heartbeats(x_3);
+x_60 = lean_ctor_get(x_59, 0);
+lean_inc(x_60);
+x_61 = lean_ctor_get(x_59, 1);
+lean_inc(x_61);
+lean_dec(x_59);
+x_62 = l_Lean_getExternConstArityExport___closed__11;
+x_63 = l_Lean_getExternConstArityExport___closed__2;
+x_64 = lean_unsigned_to_nat(0u);
+x_65 = lean_unsigned_to_nat(1000u);
+x_66 = lean_box(0);
+x_67 = lean_box(0);
+x_68 = l_Lean_getExternConstArityExport___closed__3;
+x_69 = l_Lean_firstFrontendMacroScope;
+x_70 = 0;
+x_71 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_71, 0, x_62);
+lean_ctor_set(x_71, 1, x_63);
+lean_ctor_set(x_71, 2, x_50);
+lean_ctor_set(x_71, 3, x_64);
+lean_ctor_set(x_71, 4, x_65);
+lean_ctor_set(x_71, 5, x_66);
+lean_ctor_set(x_71, 6, x_67);
+lean_ctor_set(x_71, 7, x_50);
+lean_ctor_set(x_71, 8, x_60);
+lean_ctor_set(x_71, 9, x_68);
+lean_ctor_set(x_71, 10, x_69);
+lean_ctor_set(x_71, 11, x_51);
+lean_ctor_set_uint8(x_71, sizeof(void*)*12, x_70);
+lean_ctor_set_uint8(x_71, sizeof(void*)*12 + 1, x_70);
+x_72 = lean_st_mk_ref(x_58, x_61);
+x_73 = lean_ctor_get(x_72, 0);
+lean_inc(x_73);
+x_74 = lean_ctor_get(x_72, 1);
 lean_inc(x_74);
-x_75 = lean_ctor_get(x_73, 1);
-lean_inc(x_75);
-lean_dec(x_73);
-x_76 = lean_ctor_get(x_74, 0);
+lean_dec(x_72);
+x_75 = lean_st_ref_get(x_73, x_74);
+x_76 = lean_ctor_get(x_75, 0);
 lean_inc(x_76);
-lean_dec(x_74);
-x_77 = l_Lean_Kernel_isDiagnosticsEnabled(x_76);
+x_77 = lean_ctor_get(x_75, 1);
+lean_inc(x_77);
+lean_dec(x_75);
+x_78 = lean_ctor_get(x_76, 0);
+lean_inc(x_78);
 lean_dec(x_76);
-if (x_77 == 0)
-{
-uint8_t x_155; 
-x_155 = l_Lean_getExternConstArityExport___closed__12;
-if (x_155 == 0)
-{
-uint8_t x_156; 
-x_156 = 1;
-x_78 = x_156;
-goto block_154;
-}
-else
-{
-x_78 = x_68;
-goto block_154;
-}
-}
-else
+x_79 = l_Lean_Kernel_isDiagnosticsEnabled(x_78);
+lean_dec(x_78);
+if (x_79 == 0)
 {
 uint8_t x_157; 
-x_157 = l_Lean_getExternConstArityExport___closed__12;
+x_157 = l_Lean_getExternConstArityExport___closed__13;
 if (x_157 == 0)
 {
-x_78 = x_68;
-goto block_154;
-}
-else
-{
 uint8_t x_158; 
 x_158 = 1;
-x_78 = x_158;
-goto block_154;
+x_80 = x_158;
+goto block_156;
+}
+else
+{
+x_80 = x_70;
+goto block_156;
+}
+}
+else
+{
+uint8_t x_159; 
+x_159 = l_Lean_getExternConstArityExport___closed__13;
+if (x_159 == 0)
+{
+x_80 = x_70;
+goto block_156;
+}
+else
+{
+uint8_t x_160; 
+x_160 = 1;
+x_80 = x_160;
+goto block_156;
 }
 }
 block_20:
@@ -3334,305 +3361,305 @@ goto block_20;
 }
 }
 }
-block_154:
+block_156:
 {
-if (x_78 == 0)
+if (x_80 == 0)
 {
-lean_object* x_79; lean_object* x_80; lean_object* x_81; uint8_t x_82; 
-x_79 = lean_st_ref_take(x_71, x_75);
-x_80 = lean_ctor_get(x_79, 0);
-lean_inc(x_80);
-x_81 = lean_ctor_get(x_79, 1);
-lean_inc(x_81);
-lean_dec(x_79);
-x_82 = !lean_is_exclusive(x_80);
-if (x_82 == 0)
+lean_object* x_81; lean_object* x_82; lean_object* x_83; uint8_t x_84; 
+x_81 = lean_st_ref_take(x_73, x_77);
+x_82 = lean_ctor_get(x_81, 0);
+lean_inc(x_82);
+x_83 = lean_ctor_get(x_81, 1);
+lean_inc(x_83);
+lean_dec(x_81);
+x_84 = !lean_is_exclusive(x_82);
+if (x_84 == 0)
 {
-lean_object* x_83; lean_object* x_84; uint8_t x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; 
-x_83 = lean_ctor_get(x_80, 0);
-x_84 = lean_ctor_get(x_80, 4);
-lean_dec(x_84);
-x_85 = l_Lean_getExternConstArityExport___closed__12;
-x_86 = l_Lean_Kernel_enableDiag(x_83, x_85);
-lean_ctor_set(x_80, 4, x_54);
-lean_ctor_set(x_80, 0, x_86);
-x_87 = lean_st_ref_set(x_71, x_80, x_81);
-x_88 = lean_ctor_get(x_87, 1);
-lean_inc(x_88);
-lean_dec(x_87);
-x_89 = lean_box(0);
-lean_inc(x_71);
-x_90 = l_Lean_getExternConstArityExport___lambda__1(x_50, x_85, x_2, x_89, x_69, x_71, x_88);
-if (lean_obj_tag(x_90) == 0)
+lean_object* x_85; lean_object* x_86; uint8_t x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; 
+x_85 = lean_ctor_get(x_82, 0);
+x_86 = lean_ctor_get(x_82, 4);
+lean_dec(x_86);
+x_87 = l_Lean_getExternConstArityExport___closed__13;
+x_88 = l_Lean_Kernel_enableDiag(x_85, x_87);
+lean_ctor_set(x_82, 4, x_55);
+lean_ctor_set(x_82, 0, x_88);
+x_89 = lean_st_ref_set(x_73, x_82, x_83);
+x_90 = lean_ctor_get(x_89, 1);
+lean_inc(x_90);
+lean_dec(x_89);
+x_91 = lean_box(0);
+lean_inc(x_73);
+x_92 = l_Lean_getExternConstArityExport___lambda__1(x_50, x_87, x_2, x_91, x_71, x_73, x_90);
+if (lean_obj_tag(x_92) == 0)
 {
-uint8_t x_91; 
-x_91 = !lean_is_exclusive(x_90);
-if (x_91 == 0)
+uint8_t x_93; 
+x_93 = !lean_is_exclusive(x_92);
+if (x_93 == 0)
 {
-lean_object* x_92; lean_object* x_93; uint8_t x_94; 
-x_92 = lean_ctor_get(x_90, 1);
-x_93 = lean_st_ref_get(x_71, x_92);
-lean_dec(x_71);
-x_94 = !lean_is_exclusive(x_93);
-if (x_94 == 0)
+lean_object* x_94; lean_object* x_95; uint8_t x_96; 
+x_94 = lean_ctor_get(x_92, 1);
+x_95 = lean_st_ref_get(x_73, x_94);
+lean_dec(x_73);
+x_96 = !lean_is_exclusive(x_95);
+if (x_96 == 0)
 {
-lean_object* x_95; 
-x_95 = lean_ctor_get(x_93, 0);
-lean_ctor_set(x_90, 1, x_95);
-lean_ctor_set(x_93, 0, x_90);
-x_4 = x_93;
+lean_object* x_97; 
+x_97 = lean_ctor_get(x_95, 0);
+lean_ctor_set(x_92, 1, x_97);
+lean_ctor_set(x_95, 0, x_92);
+x_4 = x_95;
 goto block_20;
 }
 else
 {
-lean_object* x_96; lean_object* x_97; lean_object* x_98; 
-x_96 = lean_ctor_get(x_93, 0);
-x_97 = lean_ctor_get(x_93, 1);
-lean_inc(x_97);
-lean_inc(x_96);
-lean_dec(x_93);
-lean_ctor_set(x_90, 1, x_96);
-x_98 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_98, 0, x_90);
-lean_ctor_set(x_98, 1, x_97);
-x_4 = x_98;
-goto block_20;
-}
-}
-else
-{
-lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; 
-x_99 = lean_ctor_get(x_90, 0);
-x_100 = lean_ctor_get(x_90, 1);
-lean_inc(x_100);
+lean_object* x_98; lean_object* x_99; lean_object* x_100; 
+x_98 = lean_ctor_get(x_95, 0);
+x_99 = lean_ctor_get(x_95, 1);
 lean_inc(x_99);
-lean_dec(x_90);
-x_101 = lean_st_ref_get(x_71, x_100);
-lean_dec(x_71);
-x_102 = lean_ctor_get(x_101, 0);
-lean_inc(x_102);
-x_103 = lean_ctor_get(x_101, 1);
-lean_inc(x_103);
-if (lean_is_exclusive(x_101)) {
- lean_ctor_release(x_101, 0);
- lean_ctor_release(x_101, 1);
- x_104 = x_101;
-} else {
- lean_dec_ref(x_101);
- x_104 = lean_box(0);
-}
-x_105 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_105, 0, x_99);
-lean_ctor_set(x_105, 1, x_102);
-if (lean_is_scalar(x_104)) {
- x_106 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_106 = x_104;
-}
-lean_ctor_set(x_106, 0, x_105);
-lean_ctor_set(x_106, 1, x_103);
-x_4 = x_106;
+lean_inc(x_98);
+lean_dec(x_95);
+lean_ctor_set(x_92, 1, x_98);
+x_100 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_100, 0, x_92);
+lean_ctor_set(x_100, 1, x_99);
+x_4 = x_100;
 goto block_20;
 }
 }
 else
 {
-lean_object* x_107; lean_object* x_108; 
-lean_dec(x_71);
-x_107 = lean_ctor_get(x_90, 0);
-lean_inc(x_107);
-x_108 = lean_ctor_get(x_90, 1);
-lean_inc(x_108);
-lean_dec(x_90);
-x_21 = x_107;
-x_22 = x_108;
+lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; 
+x_101 = lean_ctor_get(x_92, 0);
+x_102 = lean_ctor_get(x_92, 1);
+lean_inc(x_102);
+lean_inc(x_101);
+lean_dec(x_92);
+x_103 = lean_st_ref_get(x_73, x_102);
+lean_dec(x_73);
+x_104 = lean_ctor_get(x_103, 0);
+lean_inc(x_104);
+x_105 = lean_ctor_get(x_103, 1);
+lean_inc(x_105);
+if (lean_is_exclusive(x_103)) {
+ lean_ctor_release(x_103, 0);
+ lean_ctor_release(x_103, 1);
+ x_106 = x_103;
+} else {
+ lean_dec_ref(x_103);
+ x_106 = lean_box(0);
+}
+x_107 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_107, 0, x_101);
+lean_ctor_set(x_107, 1, x_104);
+if (lean_is_scalar(x_106)) {
+ x_108 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_108 = x_106;
+}
+lean_ctor_set(x_108, 0, x_107);
+lean_ctor_set(x_108, 1, x_105);
+x_4 = x_108;
+goto block_20;
+}
+}
+else
+{
+lean_object* x_109; lean_object* x_110; 
+lean_dec(x_73);
+x_109 = lean_ctor_get(x_92, 0);
+lean_inc(x_109);
+x_110 = lean_ctor_get(x_92, 1);
+lean_inc(x_110);
+lean_dec(x_92);
+x_21 = x_109;
+x_22 = x_110;
 goto block_49;
 }
 }
 else
 {
-lean_object* x_109; lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; uint8_t x_115; lean_object* x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; 
-x_109 = lean_ctor_get(x_80, 0);
-x_110 = lean_ctor_get(x_80, 1);
-x_111 = lean_ctor_get(x_80, 2);
-x_112 = lean_ctor_get(x_80, 3);
-x_113 = lean_ctor_get(x_80, 5);
-x_114 = lean_ctor_get(x_80, 6);
+lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; lean_object* x_116; uint8_t x_117; lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; 
+x_111 = lean_ctor_get(x_82, 0);
+x_112 = lean_ctor_get(x_82, 1);
+x_113 = lean_ctor_get(x_82, 2);
+x_114 = lean_ctor_get(x_82, 3);
+x_115 = lean_ctor_get(x_82, 5);
+x_116 = lean_ctor_get(x_82, 6);
+lean_inc(x_116);
+lean_inc(x_115);
 lean_inc(x_114);
 lean_inc(x_113);
 lean_inc(x_112);
 lean_inc(x_111);
-lean_inc(x_110);
-lean_inc(x_109);
-lean_dec(x_80);
-x_115 = l_Lean_getExternConstArityExport___closed__12;
-x_116 = l_Lean_Kernel_enableDiag(x_109, x_115);
-x_117 = lean_alloc_ctor(0, 7, 0);
-lean_ctor_set(x_117, 0, x_116);
-lean_ctor_set(x_117, 1, x_110);
-lean_ctor_set(x_117, 2, x_111);
-lean_ctor_set(x_117, 3, x_112);
-lean_ctor_set(x_117, 4, x_54);
-lean_ctor_set(x_117, 5, x_113);
-lean_ctor_set(x_117, 6, x_114);
-x_118 = lean_st_ref_set(x_71, x_117, x_81);
-x_119 = lean_ctor_get(x_118, 1);
-lean_inc(x_119);
-lean_dec(x_118);
-x_120 = lean_box(0);
-lean_inc(x_71);
-x_121 = l_Lean_getExternConstArityExport___lambda__1(x_50, x_115, x_2, x_120, x_69, x_71, x_119);
-if (lean_obj_tag(x_121) == 0)
+lean_dec(x_82);
+x_117 = l_Lean_getExternConstArityExport___closed__13;
+x_118 = l_Lean_Kernel_enableDiag(x_111, x_117);
+x_119 = lean_alloc_ctor(0, 7, 0);
+lean_ctor_set(x_119, 0, x_118);
+lean_ctor_set(x_119, 1, x_112);
+lean_ctor_set(x_119, 2, x_113);
+lean_ctor_set(x_119, 3, x_114);
+lean_ctor_set(x_119, 4, x_55);
+lean_ctor_set(x_119, 5, x_115);
+lean_ctor_set(x_119, 6, x_116);
+x_120 = lean_st_ref_set(x_73, x_119, x_83);
+x_121 = lean_ctor_get(x_120, 1);
+lean_inc(x_121);
+lean_dec(x_120);
+x_122 = lean_box(0);
+lean_inc(x_73);
+x_123 = l_Lean_getExternConstArityExport___lambda__1(x_50, x_117, x_2, x_122, x_71, x_73, x_121);
+if (lean_obj_tag(x_123) == 0)
 {
-lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; lean_object* x_126; lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130; 
-x_122 = lean_ctor_get(x_121, 0);
-lean_inc(x_122);
-x_123 = lean_ctor_get(x_121, 1);
-lean_inc(x_123);
-if (lean_is_exclusive(x_121)) {
- lean_ctor_release(x_121, 0);
- lean_ctor_release(x_121, 1);
- x_124 = x_121;
+lean_object* x_124; lean_object* x_125; lean_object* x_126; lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130; lean_object* x_131; lean_object* x_132; 
+x_124 = lean_ctor_get(x_123, 0);
+lean_inc(x_124);
+x_125 = lean_ctor_get(x_123, 1);
+lean_inc(x_125);
+if (lean_is_exclusive(x_123)) {
+ lean_ctor_release(x_123, 0);
+ lean_ctor_release(x_123, 1);
+ x_126 = x_123;
 } else {
- lean_dec_ref(x_121);
- x_124 = lean_box(0);
+ lean_dec_ref(x_123);
+ x_126 = lean_box(0);
 }
-x_125 = lean_st_ref_get(x_71, x_123);
-lean_dec(x_71);
-x_126 = lean_ctor_get(x_125, 0);
-lean_inc(x_126);
-x_127 = lean_ctor_get(x_125, 1);
-lean_inc(x_127);
-if (lean_is_exclusive(x_125)) {
- lean_ctor_release(x_125, 0);
- lean_ctor_release(x_125, 1);
- x_128 = x_125;
+x_127 = lean_st_ref_get(x_73, x_125);
+lean_dec(x_73);
+x_128 = lean_ctor_get(x_127, 0);
+lean_inc(x_128);
+x_129 = lean_ctor_get(x_127, 1);
+lean_inc(x_129);
+if (lean_is_exclusive(x_127)) {
+ lean_ctor_release(x_127, 0);
+ lean_ctor_release(x_127, 1);
+ x_130 = x_127;
 } else {
- lean_dec_ref(x_125);
- x_128 = lean_box(0);
+ lean_dec_ref(x_127);
+ x_130 = lean_box(0);
 }
-if (lean_is_scalar(x_124)) {
- x_129 = lean_alloc_ctor(0, 2, 0);
+if (lean_is_scalar(x_126)) {
+ x_131 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_129 = x_124;
+ x_131 = x_126;
 }
-lean_ctor_set(x_129, 0, x_122);
-lean_ctor_set(x_129, 1, x_126);
-if (lean_is_scalar(x_128)) {
- x_130 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_131, 0, x_124);
+lean_ctor_set(x_131, 1, x_128);
+if (lean_is_scalar(x_130)) {
+ x_132 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_130 = x_128;
+ x_132 = x_130;
 }
-lean_ctor_set(x_130, 0, x_129);
-lean_ctor_set(x_130, 1, x_127);
-x_4 = x_130;
+lean_ctor_set(x_132, 0, x_131);
+lean_ctor_set(x_132, 1, x_129);
+x_4 = x_132;
 goto block_20;
 }
 else
 {
-lean_object* x_131; lean_object* x_132; 
-lean_dec(x_71);
-x_131 = lean_ctor_get(x_121, 0);
-lean_inc(x_131);
-x_132 = lean_ctor_get(x_121, 1);
-lean_inc(x_132);
-lean_dec(x_121);
-x_21 = x_131;
-x_22 = x_132;
+lean_object* x_133; lean_object* x_134; 
+lean_dec(x_73);
+x_133 = lean_ctor_get(x_123, 0);
+lean_inc(x_133);
+x_134 = lean_ctor_get(x_123, 1);
+lean_inc(x_134);
+lean_dec(x_123);
+x_21 = x_133;
+x_22 = x_134;
 goto block_49;
 }
 }
 }
 else
 {
-uint8_t x_133; lean_object* x_134; lean_object* x_135; 
-x_133 = l_Lean_getExternConstArityExport___closed__12;
-x_134 = lean_box(0);
-lean_inc(x_71);
-x_135 = l_Lean_getExternConstArityExport___lambda__1(x_50, x_133, x_2, x_134, x_69, x_71, x_75);
-if (lean_obj_tag(x_135) == 0)
+uint8_t x_135; lean_object* x_136; lean_object* x_137; 
+x_135 = l_Lean_getExternConstArityExport___closed__13;
+x_136 = lean_box(0);
+lean_inc(x_73);
+x_137 = l_Lean_getExternConstArityExport___lambda__1(x_50, x_135, x_2, x_136, x_71, x_73, x_77);
+if (lean_obj_tag(x_137) == 0)
 {
-uint8_t x_136; 
-x_136 = !lean_is_exclusive(x_135);
-if (x_136 == 0)
+uint8_t x_138; 
+x_138 = !lean_is_exclusive(x_137);
+if (x_138 == 0)
 {
-lean_object* x_137; lean_object* x_138; uint8_t x_139; 
-x_137 = lean_ctor_get(x_135, 1);
-x_138 = lean_st_ref_get(x_71, x_137);
-lean_dec(x_71);
-x_139 = !lean_is_exclusive(x_138);
-if (x_139 == 0)
+lean_object* x_139; lean_object* x_140; uint8_t x_141; 
+x_139 = lean_ctor_get(x_137, 1);
+x_140 = lean_st_ref_get(x_73, x_139);
+lean_dec(x_73);
+x_141 = !lean_is_exclusive(x_140);
+if (x_141 == 0)
 {
-lean_object* x_140; 
-x_140 = lean_ctor_get(x_138, 0);
-lean_ctor_set(x_135, 1, x_140);
-lean_ctor_set(x_138, 0, x_135);
-x_4 = x_138;
+lean_object* x_142; 
+x_142 = lean_ctor_get(x_140, 0);
+lean_ctor_set(x_137, 1, x_142);
+lean_ctor_set(x_140, 0, x_137);
+x_4 = x_140;
 goto block_20;
 }
 else
 {
-lean_object* x_141; lean_object* x_142; lean_object* x_143; 
-x_141 = lean_ctor_get(x_138, 0);
-x_142 = lean_ctor_get(x_138, 1);
-lean_inc(x_142);
-lean_inc(x_141);
-lean_dec(x_138);
-lean_ctor_set(x_135, 1, x_141);
-x_143 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_143, 0, x_135);
-lean_ctor_set(x_143, 1, x_142);
-x_4 = x_143;
-goto block_20;
-}
-}
-else
-{
-lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; lean_object* x_148; lean_object* x_149; lean_object* x_150; lean_object* x_151; 
-x_144 = lean_ctor_get(x_135, 0);
-x_145 = lean_ctor_get(x_135, 1);
-lean_inc(x_145);
+lean_object* x_143; lean_object* x_144; lean_object* x_145; 
+x_143 = lean_ctor_get(x_140, 0);
+x_144 = lean_ctor_get(x_140, 1);
 lean_inc(x_144);
-lean_dec(x_135);
-x_146 = lean_st_ref_get(x_71, x_145);
-lean_dec(x_71);
-x_147 = lean_ctor_get(x_146, 0);
-lean_inc(x_147);
-x_148 = lean_ctor_get(x_146, 1);
-lean_inc(x_148);
-if (lean_is_exclusive(x_146)) {
- lean_ctor_release(x_146, 0);
- lean_ctor_release(x_146, 1);
- x_149 = x_146;
-} else {
- lean_dec_ref(x_146);
- x_149 = lean_box(0);
-}
-x_150 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_150, 0, x_144);
-lean_ctor_set(x_150, 1, x_147);
-if (lean_is_scalar(x_149)) {
- x_151 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_151 = x_149;
-}
-lean_ctor_set(x_151, 0, x_150);
-lean_ctor_set(x_151, 1, x_148);
-x_4 = x_151;
+lean_inc(x_143);
+lean_dec(x_140);
+lean_ctor_set(x_137, 1, x_143);
+x_145 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_145, 0, x_137);
+lean_ctor_set(x_145, 1, x_144);
+x_4 = x_145;
 goto block_20;
 }
 }
 else
 {
-lean_object* x_152; lean_object* x_153; 
-lean_dec(x_71);
-x_152 = lean_ctor_get(x_135, 0);
-lean_inc(x_152);
-x_153 = lean_ctor_get(x_135, 1);
-lean_inc(x_153);
-lean_dec(x_135);
-x_21 = x_152;
-x_22 = x_153;
+lean_object* x_146; lean_object* x_147; lean_object* x_148; lean_object* x_149; lean_object* x_150; lean_object* x_151; lean_object* x_152; lean_object* x_153; 
+x_146 = lean_ctor_get(x_137, 0);
+x_147 = lean_ctor_get(x_137, 1);
+lean_inc(x_147);
+lean_inc(x_146);
+lean_dec(x_137);
+x_148 = lean_st_ref_get(x_73, x_147);
+lean_dec(x_73);
+x_149 = lean_ctor_get(x_148, 0);
+lean_inc(x_149);
+x_150 = lean_ctor_get(x_148, 1);
+lean_inc(x_150);
+if (lean_is_exclusive(x_148)) {
+ lean_ctor_release(x_148, 0);
+ lean_ctor_release(x_148, 1);
+ x_151 = x_148;
+} else {
+ lean_dec_ref(x_148);
+ x_151 = lean_box(0);
+}
+x_152 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_152, 0, x_146);
+lean_ctor_set(x_152, 1, x_149);
+if (lean_is_scalar(x_151)) {
+ x_153 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_153 = x_151;
+}
+lean_ctor_set(x_153, 0, x_152);
+lean_ctor_set(x_153, 1, x_150);
+x_4 = x_153;
+goto block_20;
+}
+}
+else
+{
+lean_object* x_154; lean_object* x_155; 
+lean_dec(x_73);
+x_154 = lean_ctor_get(x_137, 0);
+lean_inc(x_154);
+x_155 = lean_ctor_get(x_137, 1);
+lean_inc(x_155);
+lean_dec(x_137);
+x_21 = x_154;
+x_22 = x_155;
 goto block_49;
 }
 }
@@ -3821,6 +3848,8 @@ lean_mark_persistent(l_Lean_getExternConstArityExport___closed__10);
 l_Lean_getExternConstArityExport___closed__11 = _init_l_Lean_getExternConstArityExport___closed__11();
 lean_mark_persistent(l_Lean_getExternConstArityExport___closed__11);
 l_Lean_getExternConstArityExport___closed__12 = _init_l_Lean_getExternConstArityExport___closed__12();
+lean_mark_persistent(l_Lean_getExternConstArityExport___closed__12);
+l_Lean_getExternConstArityExport___closed__13 = _init_l_Lean_getExternConstArityExport___closed__13();
 return lean_io_result_mk_ok(lean_box(0));
 }
 #ifdef __cplusplus

stage0/stdlib/Lean/Compiler/LCNF/Main.c

@@ -1353,7 +1353,7 @@ x_14 = l_Array_forInUnsafe_loop___at_Lean_Compiler_LCNF_checkpoint___spec__1___l
 x_15 = l_Lean_Option_get___at_Lean_Compiler_LCNF_toConfigOptions___spec__1(x_1, x_14);
 lean_ctor_set(x_8, 4, x_15);
 lean_ctor_set(x_8, 2, x_1);
-lean_ctor_set_uint8(x_8, sizeof(void*)*11, x_2);
+lean_ctor_set_uint8(x_8, sizeof(void*)*12, x_2);
 lean_inc(x_3);
 x_16 = l_Lean_isTracingEnabledFor___at_Lean_Compiler_LCNF_UnreachableBranches_elimDead_go___spec__1(x_3, x_4, x_5, x_8, x_9, x_10);
 x_17 = lean_ctor_get(x_16, 0);
@@ -1540,7 +1540,7 @@ return x_70;
 }
 else
 {
-lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; uint8_t x_85; 
+lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; uint8_t x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; uint8_t x_87; 
 x_71 = lean_ctor_get(x_8, 0);
 x_72 = lean_ctor_get(x_8, 1);
 x_73 = lean_ctor_get(x_8, 3);
@@ -1550,6 +1550,9 @@ x_76 = lean_ctor_get(x_8, 7);
 x_77 = lean_ctor_get(x_8, 8);
 x_78 = lean_ctor_get(x_8, 9);
 x_79 = lean_ctor_get(x_8, 10);
+x_80 = lean_ctor_get(x_8, 11);
+x_81 = lean_ctor_get_uint8(x_8, sizeof(void*)*12 + 1);
+lean_inc(x_80);
 lean_inc(x_79);
 lean_inc(x_78);
 lean_inc(x_77);
@@ -1560,130 +1563,132 @@ lean_inc(x_73);
 lean_inc(x_72);
 lean_inc(x_71);
 lean_dec(x_8);
-x_80 = l_Array_forInUnsafe_loop___at_Lean_Compiler_LCNF_checkpoint___spec__1___lambda__2___closed__1;
-x_81 = l_Lean_Option_get___at_Lean_Compiler_LCNF_toConfigOptions___spec__1(x_1, x_80);
-x_82 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_82, 0, x_71);
-lean_ctor_set(x_82, 1, x_72);
-lean_ctor_set(x_82, 2, x_1);
-lean_ctor_set(x_82, 3, x_73);
-lean_ctor_set(x_82, 4, x_81);
-lean_ctor_set(x_82, 5, x_74);
-lean_ctor_set(x_82, 6, x_75);
-lean_ctor_set(x_82, 7, x_76);
-lean_ctor_set(x_82, 8, x_77);
-lean_ctor_set(x_82, 9, x_78);
-lean_ctor_set(x_82, 10, x_79);
-lean_ctor_set_uint8(x_82, sizeof(void*)*11, x_2);
+x_82 = l_Array_forInUnsafe_loop___at_Lean_Compiler_LCNF_checkpoint___spec__1___lambda__2___closed__1;
+x_83 = l_Lean_Option_get___at_Lean_Compiler_LCNF_toConfigOptions___spec__1(x_1, x_82);
+x_84 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_84, 0, x_71);
+lean_ctor_set(x_84, 1, x_72);
+lean_ctor_set(x_84, 2, x_1);
+lean_ctor_set(x_84, 3, x_73);
+lean_ctor_set(x_84, 4, x_83);
+lean_ctor_set(x_84, 5, x_74);
+lean_ctor_set(x_84, 6, x_75);
+lean_ctor_set(x_84, 7, x_76);
+lean_ctor_set(x_84, 8, x_77);
+lean_ctor_set(x_84, 9, x_78);
+lean_ctor_set(x_84, 10, x_79);
+lean_ctor_set(x_84, 11, x_80);
+lean_ctor_set_uint8(x_84, sizeof(void*)*12, x_2);
+lean_ctor_set_uint8(x_84, sizeof(void*)*12 + 1, x_81);
 lean_inc(x_3);
-x_83 = l_Lean_isTracingEnabledFor___at_Lean_Compiler_LCNF_UnreachableBranches_elimDead_go___spec__1(x_3, x_4, x_5, x_82, x_9, x_10);
-x_84 = lean_ctor_get(x_83, 0);
-lean_inc(x_84);
-x_85 = lean_unbox(x_84);
-lean_dec(x_84);
-if (x_85 == 0)
-{
-lean_object* x_86; lean_object* x_87; lean_object* x_88; 
-lean_dec(x_3);
-x_86 = lean_ctor_get(x_83, 1);
+x_85 = l_Lean_isTracingEnabledFor___at_Lean_Compiler_LCNF_UnreachableBranches_elimDead_go___spec__1(x_3, x_4, x_5, x_84, x_9, x_10);
+x_86 = lean_ctor_get(x_85, 0);
 lean_inc(x_86);
-lean_dec(x_83);
-x_87 = lean_box(0);
-x_88 = l_Array_forInUnsafe_loop___at_Lean_Compiler_LCNF_checkpoint___spec__1___lambda__1(x_6, x_87, x_4, x_5, x_82, x_9, x_86);
-return x_88;
+x_87 = lean_unbox(x_86);
+lean_dec(x_86);
+if (x_87 == 0)
+{
+lean_object* x_88; lean_object* x_89; lean_object* x_90; 
+lean_dec(x_3);
+x_88 = lean_ctor_get(x_85, 1);
+lean_inc(x_88);
+lean_dec(x_85);
+x_89 = lean_box(0);
+x_90 = l_Array_forInUnsafe_loop___at_Lean_Compiler_LCNF_checkpoint___spec__1___lambda__1(x_6, x_89, x_4, x_5, x_84, x_9, x_88);
+return x_90;
 }
 else
 {
-lean_object* x_89; lean_object* x_90; lean_object* x_91; 
-x_89 = lean_ctor_get(x_83, 1);
-lean_inc(x_89);
-if (lean_is_exclusive(x_83)) {
- lean_ctor_release(x_83, 0);
- lean_ctor_release(x_83, 1);
- x_90 = x_83;
+lean_object* x_91; lean_object* x_92; lean_object* x_93; 
+x_91 = lean_ctor_get(x_85, 1);
+lean_inc(x_91);
+if (lean_is_exclusive(x_85)) {
+ lean_ctor_release(x_85, 0);
+ lean_ctor_release(x_85, 1);
+ x_92 = x_85;
 } else {
- lean_dec_ref(x_83);
- x_90 = lean_box(0);
+ lean_dec_ref(x_85);
+ x_92 = lean_box(0);
 }
 lean_inc(x_9);
-lean_inc(x_82);
+lean_inc(x_84);
 lean_inc(x_6);
-x_91 = l_Lean_Compiler_LCNF_ppDecl_x27(x_6, x_82, x_9, x_89);
-if (lean_obj_tag(x_91) == 0)
+x_93 = l_Lean_Compiler_LCNF_ppDecl_x27(x_6, x_84, x_9, x_91);
+if (lean_obj_tag(x_93) == 0)
 {
-lean_object* x_92; lean_object* x_93; lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; 
-x_92 = lean_ctor_get(x_91, 0);
-lean_inc(x_92);
-x_93 = lean_ctor_get(x_91, 1);
-lean_inc(x_93);
-lean_dec(x_91);
+lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; 
+x_94 = lean_ctor_get(x_93, 0);
+lean_inc(x_94);
+x_95 = lean_ctor_get(x_93, 1);
+lean_inc(x_95);
+lean_dec(x_93);
 lean_inc(x_6);
-x_94 = l_Lean_Compiler_LCNF_Decl_size(x_6);
-x_95 = l___private_Init_Data_Repr_0__Nat_reprFast(x_94);
-x_96 = lean_alloc_ctor(3, 1, 0);
-lean_ctor_set(x_96, 0, x_95);
-x_97 = l_Lean_MessageData_ofFormat(x_96);
-x_98 = l_Array_forInUnsafe_loop___at_Lean_Compiler_LCNF_checkpoint___spec__1___lambda__2___closed__3;
-if (lean_is_scalar(x_90)) {
- x_99 = lean_alloc_ctor(6, 2, 0);
+x_96 = l_Lean_Compiler_LCNF_Decl_size(x_6);
+x_97 = l___private_Init_Data_Repr_0__Nat_reprFast(x_96);
+x_98 = lean_alloc_ctor(3, 1, 0);
+lean_ctor_set(x_98, 0, x_97);
+x_99 = l_Lean_MessageData_ofFormat(x_98);
+x_100 = l_Array_forInUnsafe_loop___at_Lean_Compiler_LCNF_checkpoint___spec__1___lambda__2___closed__3;
+if (lean_is_scalar(x_92)) {
+ x_101 = lean_alloc_ctor(6, 2, 0);
 } else {
- x_99 = x_90;
- lean_ctor_set_tag(x_99, 6);
+ x_101 = x_92;
+ lean_ctor_set_tag(x_101, 6);
 }
-lean_ctor_set(x_99, 0, x_98);
-lean_ctor_set(x_99, 1, x_97);
-x_100 = l_Array_forInUnsafe_loop___at_Lean_Compiler_LCNF_checkpoint___spec__1___lambda__2___closed__5;
-x_101 = lean_alloc_ctor(6, 2, 0);
-lean_ctor_set(x_101, 0, x_99);
-lean_ctor_set(x_101, 1, x_100);
-x_102 = l_Lean_MessageData_ofFormat(x_92);
+lean_ctor_set(x_101, 0, x_100);
+lean_ctor_set(x_101, 1, x_99);
+x_102 = l_Array_forInUnsafe_loop___at_Lean_Compiler_LCNF_checkpoint___spec__1___lambda__2___closed__5;
 x_103 = lean_alloc_ctor(6, 2, 0);
 lean_ctor_set(x_103, 0, x_101);
 lean_ctor_set(x_103, 1, x_102);
-x_104 = l_Array_forInUnsafe_loop___at_Lean_Compiler_LCNF_checkpoint___spec__1___lambda__2___closed__7;
+x_104 = l_Lean_MessageData_ofFormat(x_94);
 x_105 = lean_alloc_ctor(6, 2, 0);
 lean_ctor_set(x_105, 0, x_103);
 lean_ctor_set(x_105, 1, x_104);
-x_106 = l_Lean_addTrace___at_Lean_Compiler_LCNF_UnreachableBranches_elimDead_go___spec__2(x_3, x_105, x_4, x_5, x_82, x_9, x_93);
-x_107 = lean_ctor_get(x_106, 0);
-lean_inc(x_107);
-x_108 = lean_ctor_get(x_106, 1);
-lean_inc(x_108);
-lean_dec(x_106);
-x_109 = l_Array_forInUnsafe_loop___at_Lean_Compiler_LCNF_checkpoint___spec__1___lambda__1(x_6, x_107, x_4, x_5, x_82, x_9, x_108);
-lean_dec(x_107);
-return x_109;
+x_106 = l_Array_forInUnsafe_loop___at_Lean_Compiler_LCNF_checkpoint___spec__1___lambda__2___closed__7;
+x_107 = lean_alloc_ctor(6, 2, 0);
+lean_ctor_set(x_107, 0, x_105);
+lean_ctor_set(x_107, 1, x_106);
+x_108 = l_Lean_addTrace___at_Lean_Compiler_LCNF_UnreachableBranches_elimDead_go___spec__2(x_3, x_107, x_4, x_5, x_84, x_9, x_95);
+x_109 = lean_ctor_get(x_108, 0);
+lean_inc(x_109);
+x_110 = lean_ctor_get(x_108, 1);
+lean_inc(x_110);
+lean_dec(x_108);
+x_111 = l_Array_forInUnsafe_loop___at_Lean_Compiler_LCNF_checkpoint___spec__1___lambda__1(x_6, x_109, x_4, x_5, x_84, x_9, x_110);
+lean_dec(x_109);
+return x_111;
 }
 else
 {
-lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; 
-lean_dec(x_90);
-lean_dec(x_82);
+lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; 
+lean_dec(x_92);
+lean_dec(x_84);
 lean_dec(x_9);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_110 = lean_ctor_get(x_91, 0);
-lean_inc(x_110);
-x_111 = lean_ctor_get(x_91, 1);
-lean_inc(x_111);
-if (lean_is_exclusive(x_91)) {
- lean_ctor_release(x_91, 0);
- lean_ctor_release(x_91, 1);
- x_112 = x_91;
+x_112 = lean_ctor_get(x_93, 0);
+lean_inc(x_112);
+x_113 = lean_ctor_get(x_93, 1);
+lean_inc(x_113);
+if (lean_is_exclusive(x_93)) {
+ lean_ctor_release(x_93, 0);
+ lean_ctor_release(x_93, 1);
+ x_114 = x_93;
 } else {
- lean_dec_ref(x_91);
- x_112 = lean_box(0);
+ lean_dec_ref(x_93);
+ x_114 = lean_box(0);
 }
-if (lean_is_scalar(x_112)) {
- x_113 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_114)) {
+ x_115 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_113 = x_112;
+ x_115 = x_114;
 }
-lean_ctor_set(x_113, 0, x_110);
-lean_ctor_set(x_113, 1, x_111);
-return x_113;
+lean_ctor_set(x_115, 0, x_112);
+lean_ctor_set(x_115, 1, x_113);
+return x_115;
 }
 }
 }
@@ -6623,7 +6628,7 @@ return x_41;
 }
 else
 {
-lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; uint8_t x_67; lean_object* x_68; uint8_t x_69; 
+lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; uint8_t x_67; lean_object* x_68; uint8_t x_69; lean_object* x_70; uint8_t x_71; 
 x_56 = lean_ctor_get(x_4, 0);
 x_57 = lean_ctor_get(x_4, 1);
 x_58 = lean_ctor_get(x_4, 2);
@@ -6635,7 +6640,10 @@ x_63 = lean_ctor_get(x_4, 7);
 x_64 = lean_ctor_get(x_4, 8);
 x_65 = lean_ctor_get(x_4, 9);
 x_66 = lean_ctor_get(x_4, 10);
-x_67 = lean_ctor_get_uint8(x_4, sizeof(void*)*11);
+x_67 = lean_ctor_get_uint8(x_4, sizeof(void*)*12);
+x_68 = lean_ctor_get(x_4, 11);
+x_69 = lean_ctor_get_uint8(x_4, sizeof(void*)*12 + 1);
+lean_inc(x_68);
 lean_inc(x_66);
 lean_inc(x_65);
 lean_inc(x_64);
@@ -6648,246 +6656,250 @@ lean_inc(x_58);
 lean_inc(x_57);
 lean_inc(x_56);
 lean_dec(x_4);
-x_68 = lean_unsigned_to_nat(8192u);
-x_69 = lean_nat_dec_le(x_68, x_60);
-if (x_69 == 0)
+x_70 = lean_unsigned_to_nat(8192u);
+x_71 = lean_nat_dec_le(x_70, x_60);
+if (x_71 == 0)
 {
-lean_object* x_70; lean_object* x_71; lean_object* x_72; 
+lean_object* x_72; lean_object* x_73; lean_object* x_74; 
 lean_dec(x_60);
-x_70 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_70, 0, x_56);
-lean_ctor_set(x_70, 1, x_57);
-lean_ctor_set(x_70, 2, x_58);
-lean_ctor_set(x_70, 3, x_59);
-lean_ctor_set(x_70, 4, x_68);
-lean_ctor_set(x_70, 5, x_61);
-lean_ctor_set(x_70, 6, x_62);
-lean_ctor_set(x_70, 7, x_63);
-lean_ctor_set(x_70, 8, x_64);
-lean_ctor_set(x_70, 9, x_65);
-lean_ctor_set(x_70, 10, x_66);
-lean_ctor_set_uint8(x_70, sizeof(void*)*11, x_67);
+x_72 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_72, 0, x_56);
+lean_ctor_set(x_72, 1, x_57);
+lean_ctor_set(x_72, 2, x_58);
+lean_ctor_set(x_72, 3, x_59);
+lean_ctor_set(x_72, 4, x_70);
+lean_ctor_set(x_72, 5, x_61);
+lean_ctor_set(x_72, 6, x_62);
+lean_ctor_set(x_72, 7, x_63);
+lean_ctor_set(x_72, 8, x_64);
+lean_ctor_set(x_72, 9, x_65);
+lean_ctor_set(x_72, 10, x_66);
+lean_ctor_set(x_72, 11, x_68);
+lean_ctor_set_uint8(x_72, sizeof(void*)*12, x_67);
+lean_ctor_set_uint8(x_72, sizeof(void*)*12 + 1, x_69);
 if (x_9 == 0)
 {
-lean_object* x_79; 
-lean_dec(x_7);
-lean_dec(x_1);
-x_79 = l_Lean_Compiler_LCNF_shouldGenerateCode___closed__9;
-x_71 = x_79;
-x_72 = x_6;
-goto block_78;
-}
-else
-{
-uint8_t x_80; 
-x_80 = lean_nat_dec_le(x_7, x_7);
-if (x_80 == 0)
-{
 lean_object* x_81; 
 lean_dec(x_7);
 lean_dec(x_1);
 x_81 = l_Lean_Compiler_LCNF_shouldGenerateCode___closed__9;
-x_71 = x_81;
-x_72 = x_6;
-goto block_78;
+x_73 = x_81;
+x_74 = x_6;
+goto block_80;
 }
 else
 {
-size_t x_82; size_t x_83; lean_object* x_84; lean_object* x_85; 
-x_82 = 0;
-x_83 = lean_usize_of_nat(x_7);
+uint8_t x_82; 
+x_82 = lean_nat_dec_le(x_7, x_7);
+if (x_82 == 0)
+{
+lean_object* x_83; 
 lean_dec(x_7);
-x_84 = l_Lean_Compiler_LCNF_shouldGenerateCode___closed__9;
-lean_inc(x_5);
-lean_inc(x_70);
-x_85 = l_Array_foldlMUnsafe_fold___at_Lean_Compiler_LCNF_PassManager_run___spec__9(x_1, x_82, x_83, x_84, x_2, x_3, x_70, x_5, x_6);
 lean_dec(x_1);
-if (lean_obj_tag(x_85) == 0)
-{
-lean_object* x_86; lean_object* x_87; 
-x_86 = lean_ctor_get(x_85, 0);
-lean_inc(x_86);
-x_87 = lean_ctor_get(x_85, 1);
-lean_inc(x_87);
-lean_dec(x_85);
-x_71 = x_86;
-x_72 = x_87;
-goto block_78;
+x_83 = l_Lean_Compiler_LCNF_shouldGenerateCode___closed__9;
+x_73 = x_83;
+x_74 = x_6;
+goto block_80;
 }
 else
 {
-lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; 
-lean_dec(x_70);
+size_t x_84; size_t x_85; lean_object* x_86; lean_object* x_87; 
+x_84 = 0;
+x_85 = lean_usize_of_nat(x_7);
+lean_dec(x_7);
+x_86 = l_Lean_Compiler_LCNF_shouldGenerateCode___closed__9;
+lean_inc(x_5);
+lean_inc(x_72);
+x_87 = l_Array_foldlMUnsafe_fold___at_Lean_Compiler_LCNF_PassManager_run___spec__9(x_1, x_84, x_85, x_86, x_2, x_3, x_72, x_5, x_6);
+lean_dec(x_1);
+if (lean_obj_tag(x_87) == 0)
+{
+lean_object* x_88; lean_object* x_89; 
+x_88 = lean_ctor_get(x_87, 0);
+lean_inc(x_88);
+x_89 = lean_ctor_get(x_87, 1);
+lean_inc(x_89);
+lean_dec(x_87);
+x_73 = x_88;
+x_74 = x_89;
+goto block_80;
+}
+else
+{
+lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; 
+lean_dec(x_72);
 lean_dec(x_5);
 lean_dec(x_3);
 lean_dec(x_2);
-x_88 = lean_ctor_get(x_85, 0);
-lean_inc(x_88);
-x_89 = lean_ctor_get(x_85, 1);
-lean_inc(x_89);
-if (lean_is_exclusive(x_85)) {
- lean_ctor_release(x_85, 0);
- lean_ctor_release(x_85, 1);
- x_90 = x_85;
+x_90 = lean_ctor_get(x_87, 0);
+lean_inc(x_90);
+x_91 = lean_ctor_get(x_87, 1);
+lean_inc(x_91);
+if (lean_is_exclusive(x_87)) {
+ lean_ctor_release(x_87, 0);
+ lean_ctor_release(x_87, 1);
+ x_92 = x_87;
 } else {
- lean_dec_ref(x_85);
- x_90 = lean_box(0);
+ lean_dec_ref(x_87);
+ x_92 = lean_box(0);
 }
-if (lean_is_scalar(x_90)) {
- x_91 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_92)) {
+ x_93 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_91 = x_90;
+ x_93 = x_92;
 }
-lean_ctor_set(x_91, 0, x_88);
-lean_ctor_set(x_91, 1, x_89);
-return x_91;
+lean_ctor_set(x_93, 0, x_90);
+lean_ctor_set(x_93, 1, x_91);
+return x_93;
 }
 }
 }
-block_78:
+block_80:
 {
-uint8_t x_73; 
-x_73 = l_Array_isEmpty___rarg(x_71);
-if (x_73 == 0)
-{
-lean_object* x_74; lean_object* x_75; 
-x_74 = lean_box(0);
-x_75 = l_Lean_Compiler_LCNF_PassManager_run___lambda__2(x_71, x_74, x_2, x_3, x_70, x_5, x_72);
-return x_75;
-}
-else
+uint8_t x_75; 
+x_75 = l_Array_isEmpty___rarg(x_73);
+if (x_75 == 0)
 {
 lean_object* x_76; lean_object* x_77; 
-lean_dec(x_71);
-lean_dec(x_70);
+x_76 = lean_box(0);
+x_77 = l_Lean_Compiler_LCNF_PassManager_run___lambda__2(x_73, x_76, x_2, x_3, x_72, x_5, x_74);
+return x_77;
+}
+else
+{
+lean_object* x_78; lean_object* x_79; 
+lean_dec(x_73);
+lean_dec(x_72);
 lean_dec(x_5);
 lean_dec(x_3);
 lean_dec(x_2);
-x_76 = l_Lean_Compiler_LCNF_shouldGenerateCode___closed__9;
-x_77 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_77, 0, x_76);
-lean_ctor_set(x_77, 1, x_72);
-return x_77;
+x_78 = l_Lean_Compiler_LCNF_shouldGenerateCode___closed__9;
+x_79 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_79, 0, x_78);
+lean_ctor_set(x_79, 1, x_74);
+return x_79;
 }
 }
 }
 else
 {
-lean_object* x_92; lean_object* x_93; lean_object* x_94; 
-x_92 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_92, 0, x_56);
-lean_ctor_set(x_92, 1, x_57);
-lean_ctor_set(x_92, 2, x_58);
-lean_ctor_set(x_92, 3, x_59);
-lean_ctor_set(x_92, 4, x_60);
-lean_ctor_set(x_92, 5, x_61);
-lean_ctor_set(x_92, 6, x_62);
-lean_ctor_set(x_92, 7, x_63);
-lean_ctor_set(x_92, 8, x_64);
-lean_ctor_set(x_92, 9, x_65);
-lean_ctor_set(x_92, 10, x_66);
-lean_ctor_set_uint8(x_92, sizeof(void*)*11, x_67);
+lean_object* x_94; lean_object* x_95; lean_object* x_96; 
+x_94 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_94, 0, x_56);
+lean_ctor_set(x_94, 1, x_57);
+lean_ctor_set(x_94, 2, x_58);
+lean_ctor_set(x_94, 3, x_59);
+lean_ctor_set(x_94, 4, x_60);
+lean_ctor_set(x_94, 5, x_61);
+lean_ctor_set(x_94, 6, x_62);
+lean_ctor_set(x_94, 7, x_63);
+lean_ctor_set(x_94, 8, x_64);
+lean_ctor_set(x_94, 9, x_65);
+lean_ctor_set(x_94, 10, x_66);
+lean_ctor_set(x_94, 11, x_68);
+lean_ctor_set_uint8(x_94, sizeof(void*)*12, x_67);
+lean_ctor_set_uint8(x_94, sizeof(void*)*12 + 1, x_69);
 if (x_9 == 0)
 {
-lean_object* x_101; 
-lean_dec(x_7);
-lean_dec(x_1);
-x_101 = l_Lean_Compiler_LCNF_shouldGenerateCode___closed__9;
-x_93 = x_101;
-x_94 = x_6;
-goto block_100;
-}
-else
-{
-uint8_t x_102; 
-x_102 = lean_nat_dec_le(x_7, x_7);
-if (x_102 == 0)
-{
 lean_object* x_103; 
 lean_dec(x_7);
 lean_dec(x_1);
 x_103 = l_Lean_Compiler_LCNF_shouldGenerateCode___closed__9;
-x_93 = x_103;
-x_94 = x_6;
-goto block_100;
+x_95 = x_103;
+x_96 = x_6;
+goto block_102;
 }
 else
 {
-size_t x_104; size_t x_105; lean_object* x_106; lean_object* x_107; 
-x_104 = 0;
-x_105 = lean_usize_of_nat(x_7);
+uint8_t x_104; 
+x_104 = lean_nat_dec_le(x_7, x_7);
+if (x_104 == 0)
+{
+lean_object* x_105; 
 lean_dec(x_7);
-x_106 = l_Lean_Compiler_LCNF_shouldGenerateCode___closed__9;
-lean_inc(x_5);
-lean_inc(x_92);
-x_107 = l_Array_foldlMUnsafe_fold___at_Lean_Compiler_LCNF_PassManager_run___spec__9(x_1, x_104, x_105, x_106, x_2, x_3, x_92, x_5, x_6);
 lean_dec(x_1);
-if (lean_obj_tag(x_107) == 0)
-{
-lean_object* x_108; lean_object* x_109; 
-x_108 = lean_ctor_get(x_107, 0);
-lean_inc(x_108);
-x_109 = lean_ctor_get(x_107, 1);
-lean_inc(x_109);
-lean_dec(x_107);
-x_93 = x_108;
-x_94 = x_109;
-goto block_100;
+x_105 = l_Lean_Compiler_LCNF_shouldGenerateCode___closed__9;
+x_95 = x_105;
+x_96 = x_6;
+goto block_102;
 }
 else
 {
-lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; 
-lean_dec(x_92);
+size_t x_106; size_t x_107; lean_object* x_108; lean_object* x_109; 
+x_106 = 0;
+x_107 = lean_usize_of_nat(x_7);
+lean_dec(x_7);
+x_108 = l_Lean_Compiler_LCNF_shouldGenerateCode___closed__9;
+lean_inc(x_5);
+lean_inc(x_94);
+x_109 = l_Array_foldlMUnsafe_fold___at_Lean_Compiler_LCNF_PassManager_run___spec__9(x_1, x_106, x_107, x_108, x_2, x_3, x_94, x_5, x_6);
+lean_dec(x_1);
+if (lean_obj_tag(x_109) == 0)
+{
+lean_object* x_110; lean_object* x_111; 
+x_110 = lean_ctor_get(x_109, 0);
+lean_inc(x_110);
+x_111 = lean_ctor_get(x_109, 1);
+lean_inc(x_111);
+lean_dec(x_109);
+x_95 = x_110;
+x_96 = x_111;
+goto block_102;
+}
+else
+{
+lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; 
+lean_dec(x_94);
 lean_dec(x_5);
 lean_dec(x_3);
 lean_dec(x_2);
-x_110 = lean_ctor_get(x_107, 0);
-lean_inc(x_110);
-x_111 = lean_ctor_get(x_107, 1);
-lean_inc(x_111);
-if (lean_is_exclusive(x_107)) {
- lean_ctor_release(x_107, 0);
- lean_ctor_release(x_107, 1);
- x_112 = x_107;
+x_112 = lean_ctor_get(x_109, 0);
+lean_inc(x_112);
+x_113 = lean_ctor_get(x_109, 1);
+lean_inc(x_113);
+if (lean_is_exclusive(x_109)) {
+ lean_ctor_release(x_109, 0);
+ lean_ctor_release(x_109, 1);
+ x_114 = x_109;
 } else {
- lean_dec_ref(x_107);
- x_112 = lean_box(0);
+ lean_dec_ref(x_109);
+ x_114 = lean_box(0);
 }
-if (lean_is_scalar(x_112)) {
- x_113 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_114)) {
+ x_115 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_113 = x_112;
+ x_115 = x_114;
 }
-lean_ctor_set(x_113, 0, x_110);
-lean_ctor_set(x_113, 1, x_111);
-return x_113;
+lean_ctor_set(x_115, 0, x_112);
+lean_ctor_set(x_115, 1, x_113);
+return x_115;
 }
 }
 }
-block_100:
+block_102:
 {
-uint8_t x_95; 
-x_95 = l_Array_isEmpty___rarg(x_93);
-if (x_95 == 0)
-{
-lean_object* x_96; lean_object* x_97; 
-x_96 = lean_box(0);
-x_97 = l_Lean_Compiler_LCNF_PassManager_run___lambda__3(x_93, x_96, x_2, x_3, x_92, x_5, x_94);
-return x_97;
-}
-else
+uint8_t x_97; 
+x_97 = l_Array_isEmpty___rarg(x_95);
+if (x_97 == 0)
 {
 lean_object* x_98; lean_object* x_99; 
-lean_dec(x_93);
-lean_dec(x_92);
+x_98 = lean_box(0);
+x_99 = l_Lean_Compiler_LCNF_PassManager_run___lambda__3(x_95, x_98, x_2, x_3, x_94, x_5, x_96);
+return x_99;
+}
+else
+{
+lean_object* x_100; lean_object* x_101; 
+lean_dec(x_95);
+lean_dec(x_94);
 lean_dec(x_5);
 lean_dec(x_3);
 lean_dec(x_2);
-x_98 = l_Lean_Compiler_LCNF_shouldGenerateCode___closed__9;
-x_99 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_99, 0, x_98);
-lean_ctor_set(x_99, 1, x_94);
-return x_99;
+x_100 = l_Lean_Compiler_LCNF_shouldGenerateCode___closed__9;
+x_101 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_101, 0, x_100);
+lean_ctor_set(x_101, 1, x_96);
+return x_101;
 }
 }
 }

stage0/stdlib/Lean/Compiler/LCNF/PrettyPrinter.c

@@ -34,6 +34,7 @@ static lean_object* l_Lean_Compiler_LCNF_PP_ppExpr___closed__14;
 static lean_object* l_Lean_Compiler_LCNF_PP_ppLetDecl___closed__5;
 static lean_object* l_Lean_Compiler_LCNF_PP_ppExpr___closed__16;
 lean_object* l_Lean_Compiler_LCNF_PP_ppParam___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+uint8_t l_Lean_Exception_isInterrupt(lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_PP_ppCode___closed__2;
 static lean_object* l_Lean_Compiler_LCNF_PP_ppParam___closed__2;
 lean_object* l_Lean_Name_toString(lean_object*, uint8_t);
@@ -742,17 +743,21 @@ if (x_20 == 0)
 {
 lean_object* x_21; uint8_t x_22; 
 x_21 = lean_ctor_get(x_8, 0);
-x_22 = l_Lean_Exception_isRuntime(x_21);
+x_22 = l_Lean_Exception_isInterrupt(x_21);
 if (x_22 == 0)
 {
-uint8_t x_23; lean_object* x_24; lean_object* x_25; 
+uint8_t x_23; 
+x_23 = l_Lean_Exception_isRuntime(x_21);
+if (x_23 == 0)
+{
+uint8_t x_24; lean_object* x_25; lean_object* x_26; 
 lean_dec(x_21);
-x_23 = 1;
-x_24 = l_Lean_Name_toString(x_1, x_23);
-x_25 = lean_alloc_ctor(3, 1, 0);
-lean_ctor_set(x_25, 0, x_24);
+x_24 = 1;
+x_25 = l_Lean_Name_toString(x_1, x_24);
+x_26 = lean_alloc_ctor(3, 1, 0);
+lean_ctor_set(x_26, 0, x_25);
 lean_ctor_set_tag(x_8, 0);
-lean_ctor_set(x_8, 0, x_25);
+lean_ctor_set(x_8, 0, x_26);
 return x_8;
 }
 else
@@ -763,34 +768,54 @@ return x_8;
 }
 else
 {
-lean_object* x_26; lean_object* x_27; uint8_t x_28; 
-x_26 = lean_ctor_get(x_8, 0);
-x_27 = lean_ctor_get(x_8, 1);
+lean_dec(x_1);
+return x_8;
+}
+}
+else
+{
+lean_object* x_27; lean_object* x_28; uint8_t x_29; 
+x_27 = lean_ctor_get(x_8, 0);
+x_28 = lean_ctor_get(x_8, 1);
+lean_inc(x_28);
 lean_inc(x_27);
-lean_inc(x_26);
 lean_dec(x_8);
-x_28 = l_Lean_Exception_isRuntime(x_26);
-if (x_28 == 0)
+x_29 = l_Lean_Exception_isInterrupt(x_27);
+if (x_29 == 0)
 {
-uint8_t x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; 
-lean_dec(x_26);
-x_29 = 1;
-x_30 = l_Lean_Name_toString(x_1, x_29);
-x_31 = lean_alloc_ctor(3, 1, 0);
-lean_ctor_set(x_31, 0, x_30);
-x_32 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_32, 0, x_31);
-lean_ctor_set(x_32, 1, x_27);
-return x_32;
+uint8_t x_30; 
+x_30 = l_Lean_Exception_isRuntime(x_27);
+if (x_30 == 0)
+{
+uint8_t x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; 
+lean_dec(x_27);
+x_31 = 1;
+x_32 = l_Lean_Name_toString(x_1, x_31);
+x_33 = lean_alloc_ctor(3, 1, 0);
+lean_ctor_set(x_33, 0, x_32);
+x_34 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_34, 0, x_33);
+lean_ctor_set(x_34, 1, x_28);
+return x_34;
 }
 else
 {
-lean_object* x_33; 
+lean_object* x_35; 
 lean_dec(x_1);
-x_33 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_33, 0, x_26);
-lean_ctor_set(x_33, 1, x_27);
-return x_33;
+x_35 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_35, 0, x_27);
+lean_ctor_set(x_35, 1, x_28);
+return x_35;
+}
+}
+else
+{
+lean_object* x_36; 
+lean_dec(x_1);
+x_36 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_36, 0, x_27);
+lean_ctor_set(x_36, 1, x_28);
+return x_36;
 }
 }
 }
@@ -4745,7 +4770,7 @@ x_13 = l_Lean_Compiler_LCNF_PP_run___rarg___lambda__1___closed__1;
 x_14 = l_Lean_Option_get___at_Lean_Compiler_LCNF_toConfigOptions___spec__1(x_1, x_13);
 lean_ctor_set(x_7, 4, x_14);
 lean_ctor_set(x_7, 2, x_1);
-lean_ctor_set_uint8(x_7, sizeof(void*)*11, x_2);
+lean_ctor_set_uint8(x_7, sizeof(void*)*12, x_2);
 x_15 = lean_st_ref_get(x_3, x_9);
 x_16 = lean_ctor_get(x_15, 0);
 lean_inc(x_16);
@@ -4761,7 +4786,7 @@ return x_20;
 }
 else
 {
-lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; 
+lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; uint8_t x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; 
 x_21 = lean_ctor_get(x_7, 0);
 x_22 = lean_ctor_get(x_7, 1);
 x_23 = lean_ctor_get(x_7, 3);
@@ -4771,6 +4796,9 @@ x_26 = lean_ctor_get(x_7, 7);
 x_27 = lean_ctor_get(x_7, 8);
 x_28 = lean_ctor_get(x_7, 9);
 x_29 = lean_ctor_get(x_7, 10);
+x_30 = lean_ctor_get(x_7, 11);
+x_31 = lean_ctor_get_uint8(x_7, sizeof(void*)*12 + 1);
+lean_inc(x_30);
 lean_inc(x_29);
 lean_inc(x_28);
 lean_inc(x_27);
@@ -4781,33 +4809,35 @@ lean_inc(x_23);
 lean_inc(x_22);
 lean_inc(x_21);
 lean_dec(x_7);
-x_30 = l_Lean_Compiler_LCNF_PP_run___rarg___lambda__1___closed__1;
-x_31 = l_Lean_Option_get___at_Lean_Compiler_LCNF_toConfigOptions___spec__1(x_1, x_30);
-x_32 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_32, 0, x_21);
-lean_ctor_set(x_32, 1, x_22);
-lean_ctor_set(x_32, 2, x_1);
-lean_ctor_set(x_32, 3, x_23);
-lean_ctor_set(x_32, 4, x_31);
-lean_ctor_set(x_32, 5, x_24);
-lean_ctor_set(x_32, 6, x_25);
-lean_ctor_set(x_32, 7, x_26);
-lean_ctor_set(x_32, 8, x_27);
-lean_ctor_set(x_32, 9, x_28);
-lean_ctor_set(x_32, 10, x_29);
-lean_ctor_set_uint8(x_32, sizeof(void*)*11, x_2);
-x_33 = lean_st_ref_get(x_3, x_9);
-x_34 = lean_ctor_get(x_33, 0);
-lean_inc(x_34);
-x_35 = lean_ctor_get(x_33, 1);
-lean_inc(x_35);
-lean_dec(x_33);
-x_36 = lean_ctor_get(x_34, 0);
+x_32 = l_Lean_Compiler_LCNF_PP_run___rarg___lambda__1___closed__1;
+x_33 = l_Lean_Option_get___at_Lean_Compiler_LCNF_toConfigOptions___spec__1(x_1, x_32);
+x_34 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_34, 0, x_21);
+lean_ctor_set(x_34, 1, x_22);
+lean_ctor_set(x_34, 2, x_1);
+lean_ctor_set(x_34, 3, x_23);
+lean_ctor_set(x_34, 4, x_33);
+lean_ctor_set(x_34, 5, x_24);
+lean_ctor_set(x_34, 6, x_25);
+lean_ctor_set(x_34, 7, x_26);
+lean_ctor_set(x_34, 8, x_27);
+lean_ctor_set(x_34, 9, x_28);
+lean_ctor_set(x_34, 10, x_29);
+lean_ctor_set(x_34, 11, x_30);
+lean_ctor_set_uint8(x_34, sizeof(void*)*12, x_2);
+lean_ctor_set_uint8(x_34, sizeof(void*)*12 + 1, x_31);
+x_35 = lean_st_ref_get(x_3, x_9);
+x_36 = lean_ctor_get(x_35, 0);
 lean_inc(x_36);
-lean_dec(x_34);
-x_37 = l_Lean_Compiler_LCNF_LCtx_toLocalContext(x_36);
-x_38 = lean_apply_6(x_4, x_37, x_5, x_3, x_32, x_8, x_35);
-return x_38;
+x_37 = lean_ctor_get(x_35, 1);
+lean_inc(x_37);
+lean_dec(x_35);
+x_38 = lean_ctor_get(x_36, 0);
+lean_inc(x_38);
+lean_dec(x_36);
+x_39 = l_Lean_Compiler_LCNF_LCtx_toLocalContext(x_38);
+x_40 = lean_apply_6(x_4, x_39, x_5, x_3, x_34, x_8, x_37);
+return x_40;
 }
 }
 }

stage0/stdlib/Lean/Compiler/LCNF/Simp/SimpM.c

@@ -4282,7 +4282,7 @@ return x_10;
 lean_object* l_Lean_Compiler_LCNF_Simp_withIncRecDepth___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
 _start:
 {
-lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; uint8_t x_21; uint8_t x_22; 
+lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; uint8_t x_21; lean_object* x_22; uint8_t x_23; uint8_t x_24; 
 x_10 = lean_ctor_get(x_7, 0);
 lean_inc(x_10);
 x_11 = lean_ctor_get(x_7, 1);
@@ -4305,71 +4305,79 @@ x_19 = lean_ctor_get(x_7, 9);
 lean_inc(x_19);
 x_20 = lean_ctor_get(x_7, 10);
 lean_inc(x_20);
-x_21 = lean_ctor_get_uint8(x_7, sizeof(void*)*11);
-x_22 = lean_nat_dec_eq(x_13, x_14);
-if (x_22 == 0)
+x_21 = lean_ctor_get_uint8(x_7, sizeof(void*)*12);
+x_22 = lean_ctor_get(x_7, 11);
+lean_inc(x_22);
+x_23 = lean_ctor_get_uint8(x_7, sizeof(void*)*12 + 1);
+x_24 = lean_nat_dec_eq(x_13, x_14);
+if (x_24 == 0)
 {
-uint8_t x_23; 
-x_23 = !lean_is_exclusive(x_7);
-if (x_23 == 0)
+uint8_t x_25; 
+x_25 = !lean_is_exclusive(x_7);
+if (x_25 == 0)
 {
-lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; 
-x_24 = lean_ctor_get(x_7, 10);
-lean_dec(x_24);
-x_25 = lean_ctor_get(x_7, 9);
-lean_dec(x_25);
-x_26 = lean_ctor_get(x_7, 8);
+lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; 
+x_26 = lean_ctor_get(x_7, 11);
 lean_dec(x_26);
-x_27 = lean_ctor_get(x_7, 7);
+x_27 = lean_ctor_get(x_7, 10);
 lean_dec(x_27);
-x_28 = lean_ctor_get(x_7, 6);
+x_28 = lean_ctor_get(x_7, 9);
 lean_dec(x_28);
-x_29 = lean_ctor_get(x_7, 5);
+x_29 = lean_ctor_get(x_7, 8);
 lean_dec(x_29);
-x_30 = lean_ctor_get(x_7, 4);
+x_30 = lean_ctor_get(x_7, 7);
 lean_dec(x_30);
-x_31 = lean_ctor_get(x_7, 3);
+x_31 = lean_ctor_get(x_7, 6);
 lean_dec(x_31);
-x_32 = lean_ctor_get(x_7, 2);
+x_32 = lean_ctor_get(x_7, 5);
 lean_dec(x_32);
-x_33 = lean_ctor_get(x_7, 1);
+x_33 = lean_ctor_get(x_7, 4);
 lean_dec(x_33);
-x_34 = lean_ctor_get(x_7, 0);
+x_34 = lean_ctor_get(x_7, 3);
 lean_dec(x_34);
-x_35 = lean_unsigned_to_nat(1u);
-x_36 = lean_nat_add(x_13, x_35);
-lean_dec(x_13);
-lean_ctor_set(x_7, 3, x_36);
-x_37 = lean_apply_8(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
-return x_37;
-}
-else
-{
-lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; 
-lean_dec(x_7);
+x_35 = lean_ctor_get(x_7, 2);
+lean_dec(x_35);
+x_36 = lean_ctor_get(x_7, 1);
+lean_dec(x_36);
+x_37 = lean_ctor_get(x_7, 0);
+lean_dec(x_37);
 x_38 = lean_unsigned_to_nat(1u);
 x_39 = lean_nat_add(x_13, x_38);
 lean_dec(x_13);
-x_40 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_40, 0, x_10);
-lean_ctor_set(x_40, 1, x_11);
-lean_ctor_set(x_40, 2, x_12);
-lean_ctor_set(x_40, 3, x_39);
-lean_ctor_set(x_40, 4, x_14);
-lean_ctor_set(x_40, 5, x_15);
-lean_ctor_set(x_40, 6, x_16);
-lean_ctor_set(x_40, 7, x_17);
-lean_ctor_set(x_40, 8, x_18);
-lean_ctor_set(x_40, 9, x_19);
-lean_ctor_set(x_40, 10, x_20);
-lean_ctor_set_uint8(x_40, sizeof(void*)*11, x_21);
-x_41 = lean_apply_8(x_1, x_2, x_3, x_4, x_5, x_6, x_40, x_8, x_9);
-return x_41;
+lean_ctor_set(x_7, 3, x_39);
+x_40 = lean_apply_8(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
+return x_40;
+}
+else
+{
+lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; 
+lean_dec(x_7);
+x_41 = lean_unsigned_to_nat(1u);
+x_42 = lean_nat_add(x_13, x_41);
+lean_dec(x_13);
+x_43 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_43, 0, x_10);
+lean_ctor_set(x_43, 1, x_11);
+lean_ctor_set(x_43, 2, x_12);
+lean_ctor_set(x_43, 3, x_42);
+lean_ctor_set(x_43, 4, x_14);
+lean_ctor_set(x_43, 5, x_15);
+lean_ctor_set(x_43, 6, x_16);
+lean_ctor_set(x_43, 7, x_17);
+lean_ctor_set(x_43, 8, x_18);
+lean_ctor_set(x_43, 9, x_19);
+lean_ctor_set(x_43, 10, x_20);
+lean_ctor_set(x_43, 11, x_22);
+lean_ctor_set_uint8(x_43, sizeof(void*)*12, x_21);
+lean_ctor_set_uint8(x_43, sizeof(void*)*12 + 1, x_23);
+x_44 = lean_apply_8(x_1, x_2, x_3, x_4, x_5, x_6, x_43, x_8, x_9);
+return x_44;
 }
 }
 else
 {
-lean_object* x_42; 
+lean_object* x_45; 
+lean_dec(x_22);
 lean_dec(x_20);
 lean_dec(x_19);
 lean_dec(x_18);
@@ -4382,8 +4390,8 @@ lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_1);
-x_42 = l_Lean_Compiler_LCNF_Simp_withIncRecDepth_throwMaxRecDepth___rarg(x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
-return x_42;
+x_45 = l_Lean_Compiler_LCNF_Simp_withIncRecDepth_throwMaxRecDepth___rarg(x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
+return x_45;
 }
 }
 }

stage0/stdlib/Lean/Compiler/LCNF/ToLCNF.c

@@ -14212,7 +14212,7 @@ return x_89;
 lean_object* l_Lean_Compiler_LCNF_ToLCNF_toLCNF_visitCore(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
-lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; uint8_t x_19; uint8_t x_20; 
+lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; uint8_t x_19; lean_object* x_20; uint8_t x_21; uint8_t x_22; 
 x_8 = lean_ctor_get(x_5, 0);
 lean_inc(x_8);
 x_9 = lean_ctor_get(x_5, 1);
@@ -14235,188 +14235,196 @@ x_17 = lean_ctor_get(x_5, 9);
 lean_inc(x_17);
 x_18 = lean_ctor_get(x_5, 10);
 lean_inc(x_18);
-x_19 = lean_ctor_get_uint8(x_5, sizeof(void*)*11);
-x_20 = lean_nat_dec_eq(x_11, x_12);
-if (x_20 == 0)
+x_19 = lean_ctor_get_uint8(x_5, sizeof(void*)*12);
+x_20 = lean_ctor_get(x_5, 11);
+lean_inc(x_20);
+x_21 = lean_ctor_get_uint8(x_5, sizeof(void*)*12 + 1);
+x_22 = lean_nat_dec_eq(x_11, x_12);
+if (x_22 == 0)
 {
-uint8_t x_21; 
-x_21 = !lean_is_exclusive(x_5);
-if (x_21 == 0)
+uint8_t x_23; 
+x_23 = !lean_is_exclusive(x_5);
+if (x_23 == 0)
 {
-lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; uint8_t x_36; 
-x_22 = lean_ctor_get(x_5, 10);
-lean_dec(x_22);
-x_23 = lean_ctor_get(x_5, 9);
-lean_dec(x_23);
-x_24 = lean_ctor_get(x_5, 8);
+lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; uint8_t x_39; 
+x_24 = lean_ctor_get(x_5, 11);
 lean_dec(x_24);
-x_25 = lean_ctor_get(x_5, 7);
+x_25 = lean_ctor_get(x_5, 10);
 lean_dec(x_25);
-x_26 = lean_ctor_get(x_5, 6);
+x_26 = lean_ctor_get(x_5, 9);
 lean_dec(x_26);
-x_27 = lean_ctor_get(x_5, 5);
+x_27 = lean_ctor_get(x_5, 8);
 lean_dec(x_27);
-x_28 = lean_ctor_get(x_5, 4);
+x_28 = lean_ctor_get(x_5, 7);
 lean_dec(x_28);
-x_29 = lean_ctor_get(x_5, 3);
+x_29 = lean_ctor_get(x_5, 6);
 lean_dec(x_29);
-x_30 = lean_ctor_get(x_5, 2);
+x_30 = lean_ctor_get(x_5, 5);
 lean_dec(x_30);
-x_31 = lean_ctor_get(x_5, 1);
+x_31 = lean_ctor_get(x_5, 4);
 lean_dec(x_31);
-x_32 = lean_ctor_get(x_5, 0);
+x_32 = lean_ctor_get(x_5, 3);
 lean_dec(x_32);
-x_33 = lean_unsigned_to_nat(1u);
-x_34 = lean_nat_add(x_11, x_33);
-lean_dec(x_11);
-lean_ctor_set(x_5, 3, x_34);
-x_35 = lean_st_ref_get(x_2, x_7);
-x_36 = !lean_is_exclusive(x_35);
-if (x_36 == 0)
-{
-lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; 
-x_37 = lean_ctor_get(x_35, 0);
-x_38 = lean_ctor_get(x_35, 1);
-x_39 = lean_ctor_get(x_37, 1);
-lean_inc(x_39);
-lean_dec(x_37);
-lean_inc(x_1);
-x_40 = l_Lean_PersistentHashMap_find_x3f___at_Lean_Compiler_LCNF_ToLCNF_toLCNF_visitCore___spec__6(x_39, x_1);
-if (lean_obj_tag(x_40) == 0)
-{
-lean_object* x_41; lean_object* x_42; 
-lean_free_object(x_35);
-x_41 = lean_box(0);
-x_42 = l_Lean_Compiler_LCNF_ToLCNF_toLCNF_visitCore___lambda__2(x_1, x_41, x_2, x_3, x_4, x_5, x_6, x_38);
-return x_42;
-}
-else
-{
-lean_object* x_43; 
-lean_dec(x_5);
-lean_dec(x_6);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-lean_dec(x_1);
-x_43 = lean_ctor_get(x_40, 0);
-lean_inc(x_43);
-lean_dec(x_40);
-lean_ctor_set(x_35, 0, x_43);
-return x_35;
-}
-}
-else
-{
-lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; 
-x_44 = lean_ctor_get(x_35, 0);
-x_45 = lean_ctor_get(x_35, 1);
-lean_inc(x_45);
-lean_inc(x_44);
+x_33 = lean_ctor_get(x_5, 2);
+lean_dec(x_33);
+x_34 = lean_ctor_get(x_5, 1);
+lean_dec(x_34);
+x_35 = lean_ctor_get(x_5, 0);
 lean_dec(x_35);
-x_46 = lean_ctor_get(x_44, 1);
-lean_inc(x_46);
-lean_dec(x_44);
-lean_inc(x_1);
-x_47 = l_Lean_PersistentHashMap_find_x3f___at_Lean_Compiler_LCNF_ToLCNF_toLCNF_visitCore___spec__6(x_46, x_1);
-if (lean_obj_tag(x_47) == 0)
-{
-lean_object* x_48; lean_object* x_49; 
-x_48 = lean_box(0);
-x_49 = l_Lean_Compiler_LCNF_ToLCNF_toLCNF_visitCore___lambda__2(x_1, x_48, x_2, x_3, x_4, x_5, x_6, x_45);
-return x_49;
-}
-else
-{
-lean_object* x_50; lean_object* x_51; 
-lean_dec(x_5);
-lean_dec(x_6);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-lean_dec(x_1);
-x_50 = lean_ctor_get(x_47, 0);
-lean_inc(x_50);
-lean_dec(x_47);
-x_51 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_51, 0, x_50);
-lean_ctor_set(x_51, 1, x_45);
-return x_51;
-}
-}
-}
-else
-{
-lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; 
-lean_dec(x_5);
-x_52 = lean_unsigned_to_nat(1u);
-x_53 = lean_nat_add(x_11, x_52);
+x_36 = lean_unsigned_to_nat(1u);
+x_37 = lean_nat_add(x_11, x_36);
 lean_dec(x_11);
-x_54 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_54, 0, x_8);
-lean_ctor_set(x_54, 1, x_9);
-lean_ctor_set(x_54, 2, x_10);
-lean_ctor_set(x_54, 3, x_53);
-lean_ctor_set(x_54, 4, x_12);
-lean_ctor_set(x_54, 5, x_13);
-lean_ctor_set(x_54, 6, x_14);
-lean_ctor_set(x_54, 7, x_15);
-lean_ctor_set(x_54, 8, x_16);
-lean_ctor_set(x_54, 9, x_17);
-lean_ctor_set(x_54, 10, x_18);
-lean_ctor_set_uint8(x_54, sizeof(void*)*11, x_19);
-x_55 = lean_st_ref_get(x_2, x_7);
-x_56 = lean_ctor_get(x_55, 0);
-lean_inc(x_56);
-x_57 = lean_ctor_get(x_55, 1);
-lean_inc(x_57);
-if (lean_is_exclusive(x_55)) {
- lean_ctor_release(x_55, 0);
- lean_ctor_release(x_55, 1);
- x_58 = x_55;
-} else {
- lean_dec_ref(x_55);
- x_58 = lean_box(0);
-}
-x_59 = lean_ctor_get(x_56, 1);
-lean_inc(x_59);
-lean_dec(x_56);
-lean_inc(x_1);
-x_60 = l_Lean_PersistentHashMap_find_x3f___at_Lean_Compiler_LCNF_ToLCNF_toLCNF_visitCore___spec__6(x_59, x_1);
-if (lean_obj_tag(x_60) == 0)
+lean_ctor_set(x_5, 3, x_37);
+x_38 = lean_st_ref_get(x_2, x_7);
+x_39 = !lean_is_exclusive(x_38);
+if (x_39 == 0)
 {
-lean_object* x_61; lean_object* x_62; 
-lean_dec(x_58);
-x_61 = lean_box(0);
-x_62 = l_Lean_Compiler_LCNF_ToLCNF_toLCNF_visitCore___lambda__2(x_1, x_61, x_2, x_3, x_4, x_54, x_6, x_57);
-return x_62;
+lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; 
+x_40 = lean_ctor_get(x_38, 0);
+x_41 = lean_ctor_get(x_38, 1);
+x_42 = lean_ctor_get(x_40, 1);
+lean_inc(x_42);
+lean_dec(x_40);
+lean_inc(x_1);
+x_43 = l_Lean_PersistentHashMap_find_x3f___at_Lean_Compiler_LCNF_ToLCNF_toLCNF_visitCore___spec__6(x_42, x_1);
+if (lean_obj_tag(x_43) == 0)
+{
+lean_object* x_44; lean_object* x_45; 
+lean_free_object(x_38);
+x_44 = lean_box(0);
+x_45 = l_Lean_Compiler_LCNF_ToLCNF_toLCNF_visitCore___lambda__2(x_1, x_44, x_2, x_3, x_4, x_5, x_6, x_41);
+return x_45;
 }
 else
 {
-lean_object* x_63; lean_object* x_64; 
-lean_dec(x_54);
+lean_object* x_46; 
+lean_dec(x_5);
 lean_dec(x_6);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_63 = lean_ctor_get(x_60, 0);
-lean_inc(x_63);
-lean_dec(x_60);
-if (lean_is_scalar(x_58)) {
- x_64 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_64 = x_58;
+x_46 = lean_ctor_get(x_43, 0);
+lean_inc(x_46);
+lean_dec(x_43);
+lean_ctor_set(x_38, 0, x_46);
+return x_38;
 }
-lean_ctor_set(x_64, 0, x_63);
-lean_ctor_set(x_64, 1, x_57);
-return x_64;
+}
+else
+{
+lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; 
+x_47 = lean_ctor_get(x_38, 0);
+x_48 = lean_ctor_get(x_38, 1);
+lean_inc(x_48);
+lean_inc(x_47);
+lean_dec(x_38);
+x_49 = lean_ctor_get(x_47, 1);
+lean_inc(x_49);
+lean_dec(x_47);
+lean_inc(x_1);
+x_50 = l_Lean_PersistentHashMap_find_x3f___at_Lean_Compiler_LCNF_ToLCNF_toLCNF_visitCore___spec__6(x_49, x_1);
+if (lean_obj_tag(x_50) == 0)
+{
+lean_object* x_51; lean_object* x_52; 
+x_51 = lean_box(0);
+x_52 = l_Lean_Compiler_LCNF_ToLCNF_toLCNF_visitCore___lambda__2(x_1, x_51, x_2, x_3, x_4, x_5, x_6, x_48);
+return x_52;
+}
+else
+{
+lean_object* x_53; lean_object* x_54; 
+lean_dec(x_5);
+lean_dec(x_6);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_53 = lean_ctor_get(x_50, 0);
+lean_inc(x_53);
+lean_dec(x_50);
+x_54 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_54, 0, x_53);
+lean_ctor_set(x_54, 1, x_48);
+return x_54;
 }
 }
 }
 else
 {
-lean_object* x_65; 
+lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; 
+lean_dec(x_5);
+x_55 = lean_unsigned_to_nat(1u);
+x_56 = lean_nat_add(x_11, x_55);
+lean_dec(x_11);
+x_57 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_57, 0, x_8);
+lean_ctor_set(x_57, 1, x_9);
+lean_ctor_set(x_57, 2, x_10);
+lean_ctor_set(x_57, 3, x_56);
+lean_ctor_set(x_57, 4, x_12);
+lean_ctor_set(x_57, 5, x_13);
+lean_ctor_set(x_57, 6, x_14);
+lean_ctor_set(x_57, 7, x_15);
+lean_ctor_set(x_57, 8, x_16);
+lean_ctor_set(x_57, 9, x_17);
+lean_ctor_set(x_57, 10, x_18);
+lean_ctor_set(x_57, 11, x_20);
+lean_ctor_set_uint8(x_57, sizeof(void*)*12, x_19);
+lean_ctor_set_uint8(x_57, sizeof(void*)*12 + 1, x_21);
+x_58 = lean_st_ref_get(x_2, x_7);
+x_59 = lean_ctor_get(x_58, 0);
+lean_inc(x_59);
+x_60 = lean_ctor_get(x_58, 1);
+lean_inc(x_60);
+if (lean_is_exclusive(x_58)) {
+ lean_ctor_release(x_58, 0);
+ lean_ctor_release(x_58, 1);
+ x_61 = x_58;
+} else {
+ lean_dec_ref(x_58);
+ x_61 = lean_box(0);
+}
+x_62 = lean_ctor_get(x_59, 1);
+lean_inc(x_62);
+lean_dec(x_59);
+lean_inc(x_1);
+x_63 = l_Lean_PersistentHashMap_find_x3f___at_Lean_Compiler_LCNF_ToLCNF_toLCNF_visitCore___spec__6(x_62, x_1);
+if (lean_obj_tag(x_63) == 0)
+{
+lean_object* x_64; lean_object* x_65; 
+lean_dec(x_61);
+x_64 = lean_box(0);
+x_65 = l_Lean_Compiler_LCNF_ToLCNF_toLCNF_visitCore___lambda__2(x_1, x_64, x_2, x_3, x_4, x_57, x_6, x_60);
+return x_65;
+}
+else
+{
+lean_object* x_66; lean_object* x_67; 
+lean_dec(x_57);
+lean_dec(x_6);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_66 = lean_ctor_get(x_63, 0);
+lean_inc(x_66);
+lean_dec(x_63);
+if (lean_is_scalar(x_61)) {
+ x_67 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_67 = x_61;
+}
+lean_ctor_set(x_67, 0, x_66);
+lean_ctor_set(x_67, 1, x_60);
+return x_67;
+}
+}
+}
+else
+{
+lean_object* x_68; 
+lean_dec(x_20);
 lean_dec(x_18);
 lean_dec(x_17);
 lean_dec(x_16);
@@ -14428,13 +14436,13 @@ lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_1);
-x_65 = l_Lean_throwMaxRecDepthAt___at_Lean_Compiler_LCNF_ToLCNF_toLCNF_visitCore___spec__9(x_13, x_2, x_3, x_4, x_5, x_6, x_7);
+x_68 = l_Lean_throwMaxRecDepthAt___at_Lean_Compiler_LCNF_ToLCNF_toLCNF_visitCore___spec__9(x_13, x_2, x_3, x_4, x_5, x_6, x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-return x_65;
+return x_68;
 }
 }
 }
@@ -15051,7 +15059,7 @@ return x_57;
 lean_object* l_Lean_Compiler_LCNF_ToLCNF_toLCNF_visit(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
-uint8_t x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; uint8_t x_20; uint8_t x_21; 
+uint8_t x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; uint8_t x_20; lean_object* x_21; uint8_t x_22; uint8_t x_23; 
 x_8 = l_Lean_Compiler_LCNF_ToLCNF_isLCProof(x_1);
 x_9 = lean_ctor_get(x_5, 0);
 lean_inc(x_9);
@@ -15075,126 +15083,94 @@ x_18 = lean_ctor_get(x_5, 9);
 lean_inc(x_18);
 x_19 = lean_ctor_get(x_5, 10);
 lean_inc(x_19);
-x_20 = lean_ctor_get_uint8(x_5, sizeof(void*)*11);
-x_21 = lean_nat_dec_eq(x_12, x_13);
+x_20 = lean_ctor_get_uint8(x_5, sizeof(void*)*12);
+x_21 = lean_ctor_get(x_5, 11);
+lean_inc(x_21);
+x_22 = lean_ctor_get_uint8(x_5, sizeof(void*)*12 + 1);
+x_23 = lean_nat_dec_eq(x_12, x_13);
 if (x_8 == 0)
 {
-if (x_21 == 0)
+if (x_23 == 0)
 {
-uint8_t x_22; 
-x_22 = !lean_is_exclusive(x_5);
-if (x_22 == 0)
+uint8_t x_24; 
+x_24 = !lean_is_exclusive(x_5);
+if (x_24 == 0)
 {
-lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; 
-x_23 = lean_ctor_get(x_5, 10);
-lean_dec(x_23);
-x_24 = lean_ctor_get(x_5, 9);
-lean_dec(x_24);
-x_25 = lean_ctor_get(x_5, 8);
+lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; 
+x_25 = lean_ctor_get(x_5, 11);
 lean_dec(x_25);
-x_26 = lean_ctor_get(x_5, 7);
+x_26 = lean_ctor_get(x_5, 10);
 lean_dec(x_26);
-x_27 = lean_ctor_get(x_5, 6);
+x_27 = lean_ctor_get(x_5, 9);
 lean_dec(x_27);
-x_28 = lean_ctor_get(x_5, 5);
+x_28 = lean_ctor_get(x_5, 8);
 lean_dec(x_28);
-x_29 = lean_ctor_get(x_5, 4);
+x_29 = lean_ctor_get(x_5, 7);
 lean_dec(x_29);
-x_30 = lean_ctor_get(x_5, 3);
+x_30 = lean_ctor_get(x_5, 6);
 lean_dec(x_30);
-x_31 = lean_ctor_get(x_5, 2);
+x_31 = lean_ctor_get(x_5, 5);
 lean_dec(x_31);
-x_32 = lean_ctor_get(x_5, 1);
+x_32 = lean_ctor_get(x_5, 4);
 lean_dec(x_32);
-x_33 = lean_ctor_get(x_5, 0);
+x_33 = lean_ctor_get(x_5, 3);
 lean_dec(x_33);
-x_34 = lean_unsigned_to_nat(1u);
-x_35 = lean_nat_add(x_12, x_34);
+x_34 = lean_ctor_get(x_5, 2);
+lean_dec(x_34);
+x_35 = lean_ctor_get(x_5, 1);
+lean_dec(x_35);
+x_36 = lean_ctor_get(x_5, 0);
+lean_dec(x_36);
+x_37 = lean_unsigned_to_nat(1u);
+x_38 = lean_nat_add(x_12, x_37);
 lean_dec(x_12);
-lean_ctor_set(x_5, 3, x_35);
-x_36 = lean_box(0);
-x_37 = l_Lean_Compiler_LCNF_ToLCNF_toLCNF_visit___lambda__3(x_1, x_36, x_2, x_3, x_4, x_5, x_6, x_7);
-return x_37;
+lean_ctor_set(x_5, 3, x_38);
+x_39 = lean_box(0);
+x_40 = l_Lean_Compiler_LCNF_ToLCNF_toLCNF_visit___lambda__3(x_1, x_39, x_2, x_3, x_4, x_5, x_6, x_7);
+return x_40;
 }
 else
 {
-lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; 
+lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; 
 lean_dec(x_5);
-x_38 = lean_unsigned_to_nat(1u);
-x_39 = lean_nat_add(x_12, x_38);
+x_41 = lean_unsigned_to_nat(1u);
+x_42 = lean_nat_add(x_12, x_41);
 lean_dec(x_12);
-x_40 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_40, 0, x_9);
-lean_ctor_set(x_40, 1, x_10);
-lean_ctor_set(x_40, 2, x_11);
-lean_ctor_set(x_40, 3, x_39);
-lean_ctor_set(x_40, 4, x_13);
-lean_ctor_set(x_40, 5, x_14);
-lean_ctor_set(x_40, 6, x_15);
-lean_ctor_set(x_40, 7, x_16);
-lean_ctor_set(x_40, 8, x_17);
-lean_ctor_set(x_40, 9, x_18);
-lean_ctor_set(x_40, 10, x_19);
-lean_ctor_set_uint8(x_40, sizeof(void*)*11, x_20);
-x_41 = lean_box(0);
-x_42 = l_Lean_Compiler_LCNF_ToLCNF_toLCNF_visit___lambda__3(x_1, x_41, x_2, x_3, x_4, x_40, x_6, x_7);
-return x_42;
-}
-}
-else
-{
-lean_object* x_43; 
-lean_dec(x_19);
-lean_dec(x_18);
-lean_dec(x_17);
-lean_dec(x_16);
-lean_dec(x_15);
-lean_dec(x_13);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_1);
-x_43 = l_Lean_throwMaxRecDepthAt___at_Lean_Compiler_LCNF_ToLCNF_toLCNF_visitCore___spec__9(x_14, x_2, x_3, x_4, x_5, x_6, x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-return x_43;
-}
-}
-else
-{
-lean_dec(x_19);
-lean_dec(x_18);
-lean_dec(x_17);
-lean_dec(x_16);
-lean_dec(x_15);
-lean_dec(x_13);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_1);
-if (x_21 == 0)
-{
-lean_object* x_44; lean_object* x_45; 
-lean_dec(x_14);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
+x_43 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_43, 0, x_9);
+lean_ctor_set(x_43, 1, x_10);
+lean_ctor_set(x_43, 2, x_11);
+lean_ctor_set(x_43, 3, x_42);
+lean_ctor_set(x_43, 4, x_13);
+lean_ctor_set(x_43, 5, x_14);
+lean_ctor_set(x_43, 6, x_15);
+lean_ctor_set(x_43, 7, x_16);
+lean_ctor_set(x_43, 8, x_17);
+lean_ctor_set(x_43, 9, x_18);
+lean_ctor_set(x_43, 10, x_19);
+lean_ctor_set(x_43, 11, x_21);
+lean_ctor_set_uint8(x_43, sizeof(void*)*12, x_20);
+lean_ctor_set_uint8(x_43, sizeof(void*)*12 + 1, x_22);
 x_44 = lean_box(0);
-x_45 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_45, 0, x_44);
-lean_ctor_set(x_45, 1, x_7);
+x_45 = l_Lean_Compiler_LCNF_ToLCNF_toLCNF_visit___lambda__3(x_1, x_44, x_2, x_3, x_4, x_43, x_6, x_7);
 return x_45;
 }
+}
 else
 {
 lean_object* x_46; 
+lean_dec(x_21);
+lean_dec(x_19);
+lean_dec(x_18);
+lean_dec(x_17);
+lean_dec(x_16);
+lean_dec(x_15);
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_1);
 x_46 = l_Lean_throwMaxRecDepthAt___at_Lean_Compiler_LCNF_ToLCNF_toLCNF_visitCore___spec__9(x_14, x_2, x_3, x_4, x_5, x_6, x_7);
 lean_dec(x_6);
 lean_dec(x_5);
@@ -15204,6 +15180,47 @@ lean_dec(x_2);
 return x_46;
 }
 }
+else
+{
+lean_dec(x_21);
+lean_dec(x_19);
+lean_dec(x_18);
+lean_dec(x_17);
+lean_dec(x_16);
+lean_dec(x_15);
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_1);
+if (x_23 == 0)
+{
+lean_object* x_47; lean_object* x_48; 
+lean_dec(x_14);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_47 = lean_box(0);
+x_48 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_48, 0, x_47);
+lean_ctor_set(x_48, 1, x_7);
+return x_48;
+}
+else
+{
+lean_object* x_49; 
+x_49 = l_Lean_throwMaxRecDepthAt___at_Lean_Compiler_LCNF_ToLCNF_toLCNF_visitCore___spec__9(x_14, x_2, x_3, x_4, x_5, x_6, x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+return x_49;
+}
+}
 }
 }
 LEAN_EXPORT lean_object* l_ReaderT_bind___at_Lean_Compiler_LCNF_ToLCNF_toLCNF_visitLambda___spec__1___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {

stage0/stdlib/Lean/Compiler/Specialize.c

@@ -649,7 +649,7 @@ return x_11;
 }
 else
 {
-lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; uint8_t x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; 
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; uint8_t x_23; lean_object* x_24; uint8_t x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; 
 x_12 = lean_ctor_get(x_5, 0);
 x_13 = lean_ctor_get(x_5, 1);
 x_14 = lean_ctor_get(x_5, 2);
@@ -661,7 +661,10 @@ x_19 = lean_ctor_get(x_5, 7);
 x_20 = lean_ctor_get(x_5, 8);
 x_21 = lean_ctor_get(x_5, 9);
 x_22 = lean_ctor_get(x_5, 10);
-x_23 = lean_ctor_get_uint8(x_5, sizeof(void*)*11);
+x_23 = lean_ctor_get_uint8(x_5, sizeof(void*)*12);
+x_24 = lean_ctor_get(x_5, 11);
+x_25 = lean_ctor_get_uint8(x_5, sizeof(void*)*12 + 1);
+lean_inc(x_24);
 lean_inc(x_22);
 lean_inc(x_21);
 lean_inc(x_20);
@@ -674,24 +677,26 @@ lean_inc(x_14);
 lean_inc(x_13);
 lean_inc(x_12);
 lean_dec(x_5);
-x_24 = l_Lean_replaceRef(x_1, x_17);
+x_26 = l_Lean_replaceRef(x_1, x_17);
 lean_dec(x_17);
-x_25 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_25, 0, x_12);
-lean_ctor_set(x_25, 1, x_13);
-lean_ctor_set(x_25, 2, x_14);
-lean_ctor_set(x_25, 3, x_15);
-lean_ctor_set(x_25, 4, x_16);
-lean_ctor_set(x_25, 5, x_24);
-lean_ctor_set(x_25, 6, x_18);
-lean_ctor_set(x_25, 7, x_19);
-lean_ctor_set(x_25, 8, x_20);
-lean_ctor_set(x_25, 9, x_21);
-lean_ctor_set(x_25, 10, x_22);
-lean_ctor_set_uint8(x_25, sizeof(void*)*11, x_23);
-x_26 = l_Lean_throwError___at___private_Lean_Meta_Basic_0__Lean_Meta_processPostponedStep___spec__1(x_2, x_3, x_4, x_25, x_6, x_7);
-lean_dec(x_25);
-return x_26;
+x_27 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_27, 0, x_12);
+lean_ctor_set(x_27, 1, x_13);
+lean_ctor_set(x_27, 2, x_14);
+lean_ctor_set(x_27, 3, x_15);
+lean_ctor_set(x_27, 4, x_16);
+lean_ctor_set(x_27, 5, x_26);
+lean_ctor_set(x_27, 6, x_18);
+lean_ctor_set(x_27, 7, x_19);
+lean_ctor_set(x_27, 8, x_20);
+lean_ctor_set(x_27, 9, x_21);
+lean_ctor_set(x_27, 10, x_22);
+lean_ctor_set(x_27, 11, x_24);
+lean_ctor_set_uint8(x_27, sizeof(void*)*12, x_23);
+lean_ctor_set_uint8(x_27, sizeof(void*)*12 + 1, x_25);
+x_28 = l_Lean_throwError___at___private_Lean_Meta_Basic_0__Lean_Meta_processPostponedStep___spec__1(x_2, x_3, x_4, x_27, x_6, x_7);
+lean_dec(x_27);
+return x_28;
 }
 }
 }
@@ -814,7 +819,7 @@ return x_11;
 }
 else
 {
-lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; uint8_t x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; 
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; uint8_t x_23; lean_object* x_24; uint8_t x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; 
 x_12 = lean_ctor_get(x_5, 0);
 x_13 = lean_ctor_get(x_5, 1);
 x_14 = lean_ctor_get(x_5, 2);
@@ -826,7 +831,10 @@ x_19 = lean_ctor_get(x_5, 7);
 x_20 = lean_ctor_get(x_5, 8);
 x_21 = lean_ctor_get(x_5, 9);
 x_22 = lean_ctor_get(x_5, 10);
-x_23 = lean_ctor_get_uint8(x_5, sizeof(void*)*11);
+x_23 = lean_ctor_get_uint8(x_5, sizeof(void*)*12);
+x_24 = lean_ctor_get(x_5, 11);
+x_25 = lean_ctor_get_uint8(x_5, sizeof(void*)*12 + 1);
+lean_inc(x_24);
 lean_inc(x_22);
 lean_inc(x_21);
 lean_inc(x_20);
@@ -839,28 +847,30 @@ lean_inc(x_14);
 lean_inc(x_13);
 lean_inc(x_12);
 lean_dec(x_5);
-x_24 = l_Lean_replaceRef(x_1, x_17);
+x_26 = l_Lean_replaceRef(x_1, x_17);
 lean_dec(x_17);
 lean_dec(x_1);
-x_25 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_25, 0, x_12);
-lean_ctor_set(x_25, 1, x_13);
-lean_ctor_set(x_25, 2, x_14);
-lean_ctor_set(x_25, 3, x_15);
-lean_ctor_set(x_25, 4, x_16);
-lean_ctor_set(x_25, 5, x_24);
-lean_ctor_set(x_25, 6, x_18);
-lean_ctor_set(x_25, 7, x_19);
-lean_ctor_set(x_25, 8, x_20);
-lean_ctor_set(x_25, 9, x_21);
-lean_ctor_set(x_25, 10, x_22);
-lean_ctor_set_uint8(x_25, sizeof(void*)*11, x_23);
-x_26 = l_Lean_throwError___at___private_Lean_Compiler_Specialize_0__Lean_Compiler_elabSpecArgs___spec__7(x_2, x_3, x_4, x_25, x_6, x_7);
+x_27 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_27, 0, x_12);
+lean_ctor_set(x_27, 1, x_13);
+lean_ctor_set(x_27, 2, x_14);
+lean_ctor_set(x_27, 3, x_15);
+lean_ctor_set(x_27, 4, x_16);
+lean_ctor_set(x_27, 5, x_26);
+lean_ctor_set(x_27, 6, x_18);
+lean_ctor_set(x_27, 7, x_19);
+lean_ctor_set(x_27, 8, x_20);
+lean_ctor_set(x_27, 9, x_21);
+lean_ctor_set(x_27, 10, x_22);
+lean_ctor_set(x_27, 11, x_24);
+lean_ctor_set_uint8(x_27, sizeof(void*)*12, x_23);
+lean_ctor_set_uint8(x_27, sizeof(void*)*12 + 1, x_25);
+x_28 = l_Lean_throwError___at___private_Lean_Compiler_Specialize_0__Lean_Compiler_elabSpecArgs___spec__7(x_2, x_3, x_4, x_27, x_6, x_7);
 lean_dec(x_6);
-lean_dec(x_25);
+lean_dec(x_27);
 lean_dec(x_4);
 lean_dec(x_3);
-return x_26;
+return x_28;
 }
 }
 }

stage0/stdlib/Lean/Elab/Arg.c

@@ -371,7 +371,7 @@ return x_11;
 }
 else
 {
-lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; uint8_t x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; 
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; uint8_t x_23; lean_object* x_24; uint8_t x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; 
 x_12 = lean_ctor_get(x_5, 0);
 x_13 = lean_ctor_get(x_5, 1);
 x_14 = lean_ctor_get(x_5, 2);
@@ -383,7 +383,10 @@ x_19 = lean_ctor_get(x_5, 7);
 x_20 = lean_ctor_get(x_5, 8);
 x_21 = lean_ctor_get(x_5, 9);
 x_22 = lean_ctor_get(x_5, 10);
-x_23 = lean_ctor_get_uint8(x_5, sizeof(void*)*11);
+x_23 = lean_ctor_get_uint8(x_5, sizeof(void*)*12);
+x_24 = lean_ctor_get(x_5, 11);
+x_25 = lean_ctor_get_uint8(x_5, sizeof(void*)*12 + 1);
+lean_inc(x_24);
 lean_inc(x_22);
 lean_inc(x_21);
 lean_inc(x_20);
@@ -396,28 +399,30 @@ lean_inc(x_14);
 lean_inc(x_13);
 lean_inc(x_12);
 lean_dec(x_5);
-x_24 = l_Lean_replaceRef(x_1, x_17);
+x_26 = l_Lean_replaceRef(x_1, x_17);
 lean_dec(x_17);
 lean_dec(x_1);
-x_25 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_25, 0, x_12);
-lean_ctor_set(x_25, 1, x_13);
-lean_ctor_set(x_25, 2, x_14);
-lean_ctor_set(x_25, 3, x_15);
-lean_ctor_set(x_25, 4, x_16);
-lean_ctor_set(x_25, 5, x_24);
-lean_ctor_set(x_25, 6, x_18);
-lean_ctor_set(x_25, 7, x_19);
-lean_ctor_set(x_25, 8, x_20);
-lean_ctor_set(x_25, 9, x_21);
-lean_ctor_set(x_25, 10, x_22);
-lean_ctor_set_uint8(x_25, sizeof(void*)*11, x_23);
-x_26 = l_Lean_throwError___at_Lean_Elab_Term_expandArgs___spec__2(x_2, x_3, x_4, x_25, x_6, x_7);
+x_27 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_27, 0, x_12);
+lean_ctor_set(x_27, 1, x_13);
+lean_ctor_set(x_27, 2, x_14);
+lean_ctor_set(x_27, 3, x_15);
+lean_ctor_set(x_27, 4, x_16);
+lean_ctor_set(x_27, 5, x_26);
+lean_ctor_set(x_27, 6, x_18);
+lean_ctor_set(x_27, 7, x_19);
+lean_ctor_set(x_27, 8, x_20);
+lean_ctor_set(x_27, 9, x_21);
+lean_ctor_set(x_27, 10, x_22);
+lean_ctor_set(x_27, 11, x_24);
+lean_ctor_set_uint8(x_27, sizeof(void*)*12, x_23);
+lean_ctor_set_uint8(x_27, sizeof(void*)*12 + 1, x_25);
+x_28 = l_Lean_throwError___at_Lean_Elab_Term_expandArgs___spec__2(x_2, x_3, x_4, x_27, x_6, x_7);
 lean_dec(x_6);
-lean_dec(x_25);
+lean_dec(x_27);
 lean_dec(x_4);
 lean_dec(x_3);
-return x_26;
+return x_28;
 }
 }
 }

stage0/stdlib/Lean/Elab/Calc.c

@@ -15157,7 +15157,7 @@ return x_62;
 }
 else
 {
-lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; uint8_t x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; 
+lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; uint8_t x_74; lean_object* x_75; uint8_t x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; 
 x_63 = lean_ctor_get(x_12, 0);
 x_64 = lean_ctor_get(x_12, 1);
 x_65 = lean_ctor_get(x_12, 2);
@@ -15169,7 +15169,10 @@ x_70 = lean_ctor_get(x_12, 7);
 x_71 = lean_ctor_get(x_12, 8);
 x_72 = lean_ctor_get(x_12, 9);
 x_73 = lean_ctor_get(x_12, 10);
-x_74 = lean_ctor_get_uint8(x_12, sizeof(void*)*11);
+x_74 = lean_ctor_get_uint8(x_12, sizeof(void*)*12);
+x_75 = lean_ctor_get(x_12, 11);
+x_76 = lean_ctor_get_uint8(x_12, sizeof(void*)*12 + 1);
+lean_inc(x_75);
 lean_inc(x_73);
 lean_inc(x_72);
 lean_inc(x_71);
@@ -15182,85 +15185,87 @@ lean_inc(x_65);
 lean_inc(x_64);
 lean_inc(x_63);
 lean_dec(x_12);
-x_75 = l_Lean_replaceRef(x_4, x_68);
+x_77 = l_Lean_replaceRef(x_4, x_68);
 lean_dec(x_68);
-x_76 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_76, 0, x_63);
-lean_ctor_set(x_76, 1, x_64);
-lean_ctor_set(x_76, 2, x_65);
-lean_ctor_set(x_76, 3, x_66);
-lean_ctor_set(x_76, 4, x_67);
-lean_ctor_set(x_76, 5, x_75);
-lean_ctor_set(x_76, 6, x_69);
-lean_ctor_set(x_76, 7, x_70);
-lean_ctor_set(x_76, 8, x_71);
-lean_ctor_set(x_76, 9, x_72);
-lean_ctor_set(x_76, 10, x_73);
-lean_ctor_set_uint8(x_76, sizeof(void*)*11, x_74);
-x_77 = l_Lean_Elab_Term_mkCalcTrans(x_42, x_43, x_39, x_1, x_10, x_11, x_76, x_13, x_45);
-if (lean_obj_tag(x_77) == 0)
+x_78 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_78, 0, x_63);
+lean_ctor_set(x_78, 1, x_64);
+lean_ctor_set(x_78, 2, x_65);
+lean_ctor_set(x_78, 3, x_66);
+lean_ctor_set(x_78, 4, x_67);
+lean_ctor_set(x_78, 5, x_77);
+lean_ctor_set(x_78, 6, x_69);
+lean_ctor_set(x_78, 7, x_70);
+lean_ctor_set(x_78, 8, x_71);
+lean_ctor_set(x_78, 9, x_72);
+lean_ctor_set(x_78, 10, x_73);
+lean_ctor_set(x_78, 11, x_75);
+lean_ctor_set_uint8(x_78, sizeof(void*)*12, x_74);
+lean_ctor_set_uint8(x_78, sizeof(void*)*12 + 1, x_76);
+x_79 = l_Lean_Elab_Term_mkCalcTrans(x_42, x_43, x_39, x_1, x_10, x_11, x_78, x_13, x_45);
+if (lean_obj_tag(x_79) == 0)
 {
-lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; 
-x_78 = lean_ctor_get(x_77, 0);
-lean_inc(x_78);
-x_79 = lean_ctor_get(x_77, 1);
-lean_inc(x_79);
-if (lean_is_exclusive(x_77)) {
- lean_ctor_release(x_77, 0);
- lean_ctor_release(x_77, 1);
- x_80 = x_77;
+lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; 
+x_80 = lean_ctor_get(x_79, 0);
+lean_inc(x_80);
+x_81 = lean_ctor_get(x_79, 1);
+lean_inc(x_81);
+if (lean_is_exclusive(x_79)) {
+ lean_ctor_release(x_79, 0);
+ lean_ctor_release(x_79, 1);
+ x_82 = x_79;
 } else {
- lean_dec_ref(x_77);
- x_80 = lean_box(0);
+ lean_dec_ref(x_79);
+ x_82 = lean_box(0);
 }
-lean_ctor_set(x_6, 0, x_78);
-x_81 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_81, 0, x_3);
+lean_ctor_set(x_6, 0, x_80);
+x_83 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_83, 0, x_3);
 lean_ctor_set(x_38, 1, x_6);
-lean_ctor_set(x_38, 0, x_81);
-x_82 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_82, 0, x_38);
-if (lean_is_scalar(x_80)) {
- x_83 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_38, 0, x_83);
+x_84 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_84, 0, x_38);
+if (lean_is_scalar(x_82)) {
+ x_85 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_83 = x_80;
+ x_85 = x_82;
 }
-lean_ctor_set(x_83, 0, x_82);
-lean_ctor_set(x_83, 1, x_79);
-return x_83;
+lean_ctor_set(x_85, 0, x_84);
+lean_ctor_set(x_85, 1, x_81);
+return x_85;
 }
 else
 {
-lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; 
+lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; 
 lean_free_object(x_38);
 lean_free_object(x_6);
 lean_dec(x_3);
-x_84 = lean_ctor_get(x_77, 0);
-lean_inc(x_84);
-x_85 = lean_ctor_get(x_77, 1);
-lean_inc(x_85);
-if (lean_is_exclusive(x_77)) {
- lean_ctor_release(x_77, 0);
- lean_ctor_release(x_77, 1);
- x_86 = x_77;
+x_86 = lean_ctor_get(x_79, 0);
+lean_inc(x_86);
+x_87 = lean_ctor_get(x_79, 1);
+lean_inc(x_87);
+if (lean_is_exclusive(x_79)) {
+ lean_ctor_release(x_79, 0);
+ lean_ctor_release(x_79, 1);
+ x_88 = x_79;
 } else {
- lean_dec_ref(x_77);
- x_86 = lean_box(0);
+ lean_dec_ref(x_79);
+ x_88 = lean_box(0);
 }
-if (lean_is_scalar(x_86)) {
- x_87 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_88)) {
+ x_89 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_87 = x_86;
+ x_89 = x_88;
 }
-lean_ctor_set(x_87, 0, x_84);
-lean_ctor_set(x_87, 1, x_85);
-return x_87;
+lean_ctor_set(x_89, 0, x_86);
+lean_ctor_set(x_89, 1, x_87);
+return x_89;
 }
 }
 }
 else
 {
-uint8_t x_88; 
+uint8_t x_90; 
 lean_free_object(x_38);
 lean_dec(x_43);
 lean_dec(x_42);
@@ -15272,68 +15277,71 @@ lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_3);
 lean_dec(x_1);
-x_88 = !lean_is_exclusive(x_44);
-if (x_88 == 0)
+x_90 = !lean_is_exclusive(x_44);
+if (x_90 == 0)
 {
 return x_44;
 }
 else
 {
-lean_object* x_89; lean_object* x_90; lean_object* x_91; 
-x_89 = lean_ctor_get(x_44, 0);
-x_90 = lean_ctor_get(x_44, 1);
-lean_inc(x_90);
-lean_inc(x_89);
+lean_object* x_91; lean_object* x_92; lean_object* x_93; 
+x_91 = lean_ctor_get(x_44, 0);
+x_92 = lean_ctor_get(x_44, 1);
+lean_inc(x_92);
+lean_inc(x_91);
 lean_dec(x_44);
-x_91 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_91, 0, x_89);
-lean_ctor_set(x_91, 1, x_90);
-return x_91;
+x_93 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_93, 0, x_91);
+lean_ctor_set(x_93, 1, x_92);
+return x_93;
 }
 }
 }
 else
 {
-lean_object* x_92; lean_object* x_93; lean_object* x_94; 
-x_92 = lean_ctor_get(x_38, 0);
-x_93 = lean_ctor_get(x_38, 1);
-lean_inc(x_93);
-lean_inc(x_92);
+lean_object* x_94; lean_object* x_95; lean_object* x_96; 
+x_94 = lean_ctor_get(x_38, 0);
+x_95 = lean_ctor_get(x_38, 1);
+lean_inc(x_95);
+lean_inc(x_94);
 lean_dec(x_38);
 lean_inc(x_13);
 lean_inc(x_12);
 lean_inc(x_11);
 lean_inc(x_10);
-x_94 = l_Lean_Elab_Term_synthesizeSyntheticMVarsUsingDefault(x_8, x_9, x_10, x_11, x_12, x_13, x_40);
-if (lean_obj_tag(x_94) == 0)
+x_96 = l_Lean_Elab_Term_synthesizeSyntheticMVarsUsingDefault(x_8, x_9, x_10, x_11, x_12, x_13, x_40);
+if (lean_obj_tag(x_96) == 0)
 {
-lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; uint8_t x_107; lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; 
-x_95 = lean_ctor_get(x_94, 1);
-lean_inc(x_95);
-lean_dec(x_94);
-x_96 = lean_ctor_get(x_12, 0);
-lean_inc(x_96);
-x_97 = lean_ctor_get(x_12, 1);
+lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; uint8_t x_109; lean_object* x_110; uint8_t x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; 
+x_97 = lean_ctor_get(x_96, 1);
 lean_inc(x_97);
-x_98 = lean_ctor_get(x_12, 2);
+lean_dec(x_96);
+x_98 = lean_ctor_get(x_12, 0);
 lean_inc(x_98);
-x_99 = lean_ctor_get(x_12, 3);
+x_99 = lean_ctor_get(x_12, 1);
 lean_inc(x_99);
-x_100 = lean_ctor_get(x_12, 4);
+x_100 = lean_ctor_get(x_12, 2);
 lean_inc(x_100);
-x_101 = lean_ctor_get(x_12, 5);
+x_101 = lean_ctor_get(x_12, 3);
 lean_inc(x_101);
-x_102 = lean_ctor_get(x_12, 6);
+x_102 = lean_ctor_get(x_12, 4);
 lean_inc(x_102);
-x_103 = lean_ctor_get(x_12, 7);
+x_103 = lean_ctor_get(x_12, 5);
 lean_inc(x_103);
-x_104 = lean_ctor_get(x_12, 8);
+x_104 = lean_ctor_get(x_12, 6);
 lean_inc(x_104);
-x_105 = lean_ctor_get(x_12, 9);
+x_105 = lean_ctor_get(x_12, 7);
 lean_inc(x_105);
-x_106 = lean_ctor_get(x_12, 10);
+x_106 = lean_ctor_get(x_12, 8);
 lean_inc(x_106);
-x_107 = lean_ctor_get_uint8(x_12, sizeof(void*)*11);
+x_107 = lean_ctor_get(x_12, 9);
+lean_inc(x_107);
+x_108 = lean_ctor_get(x_12, 10);
+lean_inc(x_108);
+x_109 = lean_ctor_get_uint8(x_12, sizeof(void*)*12);
+x_110 = lean_ctor_get(x_12, 11);
+lean_inc(x_110);
+x_111 = lean_ctor_get_uint8(x_12, sizeof(void*)*12 + 1);
 if (lean_is_exclusive(x_12)) {
  lean_ctor_release(x_12, 0);
  lean_ctor_release(x_12, 1);
@@ -15346,113 +15354,81 @@ if (lean_is_exclusive(x_12)) {
  lean_ctor_release(x_12, 8);
  lean_ctor_release(x_12, 9);
  lean_ctor_release(x_12, 10);
- x_108 = x_12;
+ lean_ctor_release(x_12, 11);
+ x_112 = x_12;
 } else {
  lean_dec_ref(x_12);
- x_108 = lean_box(0);
+ x_112 = lean_box(0);
 }
-x_109 = l_Lean_replaceRef(x_4, x_101);
-lean_dec(x_101);
-if (lean_is_scalar(x_108)) {
- x_110 = lean_alloc_ctor(0, 11, 1);
+x_113 = l_Lean_replaceRef(x_4, x_103);
+lean_dec(x_103);
+if (lean_is_scalar(x_112)) {
+ x_114 = lean_alloc_ctor(0, 12, 2);
 } else {
- x_110 = x_108;
+ x_114 = x_112;
 }
-lean_ctor_set(x_110, 0, x_96);
-lean_ctor_set(x_110, 1, x_97);
-lean_ctor_set(x_110, 2, x_98);
-lean_ctor_set(x_110, 3, x_99);
-lean_ctor_set(x_110, 4, x_100);
-lean_ctor_set(x_110, 5, x_109);
-lean_ctor_set(x_110, 6, x_102);
-lean_ctor_set(x_110, 7, x_103);
-lean_ctor_set(x_110, 8, x_104);
-lean_ctor_set(x_110, 9, x_105);
-lean_ctor_set(x_110, 10, x_106);
-lean_ctor_set_uint8(x_110, sizeof(void*)*11, x_107);
-x_111 = l_Lean_Elab_Term_mkCalcTrans(x_92, x_93, x_39, x_1, x_10, x_11, x_110, x_13, x_95);
-if (lean_obj_tag(x_111) == 0)
+lean_ctor_set(x_114, 0, x_98);
+lean_ctor_set(x_114, 1, x_99);
+lean_ctor_set(x_114, 2, x_100);
+lean_ctor_set(x_114, 3, x_101);
+lean_ctor_set(x_114, 4, x_102);
+lean_ctor_set(x_114, 5, x_113);
+lean_ctor_set(x_114, 6, x_104);
+lean_ctor_set(x_114, 7, x_105);
+lean_ctor_set(x_114, 8, x_106);
+lean_ctor_set(x_114, 9, x_107);
+lean_ctor_set(x_114, 10, x_108);
+lean_ctor_set(x_114, 11, x_110);
+lean_ctor_set_uint8(x_114, sizeof(void*)*12, x_109);
+lean_ctor_set_uint8(x_114, sizeof(void*)*12 + 1, x_111);
+x_115 = l_Lean_Elab_Term_mkCalcTrans(x_94, x_95, x_39, x_1, x_10, x_11, x_114, x_13, x_97);
+if (lean_obj_tag(x_115) == 0)
 {
-lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; lean_object* x_118; 
-x_112 = lean_ctor_get(x_111, 0);
-lean_inc(x_112);
-x_113 = lean_ctor_get(x_111, 1);
-lean_inc(x_113);
-if (lean_is_exclusive(x_111)) {
- lean_ctor_release(x_111, 0);
- lean_ctor_release(x_111, 1);
- x_114 = x_111;
+lean_object* x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; 
+x_116 = lean_ctor_get(x_115, 0);
+lean_inc(x_116);
+x_117 = lean_ctor_get(x_115, 1);
+lean_inc(x_117);
+if (lean_is_exclusive(x_115)) {
+ lean_ctor_release(x_115, 0);
+ lean_ctor_release(x_115, 1);
+ x_118 = x_115;
 } else {
- lean_dec_ref(x_111);
- x_114 = lean_box(0);
+ lean_dec_ref(x_115);
+ x_118 = lean_box(0);
 }
-lean_ctor_set(x_6, 0, x_112);
-x_115 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_115, 0, x_3);
-x_116 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_116, 0, x_115);
-lean_ctor_set(x_116, 1, x_6);
-x_117 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_117, 0, x_116);
-if (lean_is_scalar(x_114)) {
- x_118 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_6, 0, x_116);
+x_119 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_119, 0, x_3);
+x_120 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_120, 0, x_119);
+lean_ctor_set(x_120, 1, x_6);
+x_121 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_121, 0, x_120);
+if (lean_is_scalar(x_118)) {
+ x_122 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_118 = x_114;
+ x_122 = x_118;
 }
-lean_ctor_set(x_118, 0, x_117);
-lean_ctor_set(x_118, 1, x_113);
-return x_118;
-}
-else
-{
-lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; 
-lean_free_object(x_6);
-lean_dec(x_3);
-x_119 = lean_ctor_get(x_111, 0);
-lean_inc(x_119);
-x_120 = lean_ctor_get(x_111, 1);
-lean_inc(x_120);
-if (lean_is_exclusive(x_111)) {
- lean_ctor_release(x_111, 0);
- lean_ctor_release(x_111, 1);
- x_121 = x_111;
-} else {
- lean_dec_ref(x_111);
- x_121 = lean_box(0);
-}
-if (lean_is_scalar(x_121)) {
- x_122 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_122 = x_121;
-}
-lean_ctor_set(x_122, 0, x_119);
-lean_ctor_set(x_122, 1, x_120);
+lean_ctor_set(x_122, 0, x_121);
+lean_ctor_set(x_122, 1, x_117);
 return x_122;
 }
-}
 else
 {
 lean_object* x_123; lean_object* x_124; lean_object* x_125; lean_object* x_126; 
-lean_dec(x_93);
-lean_dec(x_92);
-lean_dec(x_39);
 lean_free_object(x_6);
-lean_dec(x_13);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_10);
 lean_dec(x_3);
-lean_dec(x_1);
-x_123 = lean_ctor_get(x_94, 0);
+x_123 = lean_ctor_get(x_115, 0);
 lean_inc(x_123);
-x_124 = lean_ctor_get(x_94, 1);
+x_124 = lean_ctor_get(x_115, 1);
 lean_inc(x_124);
-if (lean_is_exclusive(x_94)) {
- lean_ctor_release(x_94, 0);
- lean_ctor_release(x_94, 1);
- x_125 = x_94;
+if (lean_is_exclusive(x_115)) {
+ lean_ctor_release(x_115, 0);
+ lean_ctor_release(x_115, 1);
+ x_125 = x_115;
 } else {
- lean_dec_ref(x_94);
+ lean_dec_ref(x_115);
  x_125 = lean_box(0);
 }
 if (lean_is_scalar(x_125)) {
@@ -15465,64 +15441,102 @@ lean_ctor_set(x_126, 1, x_124);
 return x_126;
 }
 }
+else
+{
+lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130; 
+lean_dec(x_95);
+lean_dec(x_94);
+lean_dec(x_39);
+lean_free_object(x_6);
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_3);
+lean_dec(x_1);
+x_127 = lean_ctor_get(x_96, 0);
+lean_inc(x_127);
+x_128 = lean_ctor_get(x_96, 1);
+lean_inc(x_128);
+if (lean_is_exclusive(x_96)) {
+ lean_ctor_release(x_96, 0);
+ lean_ctor_release(x_96, 1);
+ x_129 = x_96;
+} else {
+ lean_dec_ref(x_96);
+ x_129 = lean_box(0);
+}
+if (lean_is_scalar(x_129)) {
+ x_130 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_130 = x_129;
+}
+lean_ctor_set(x_130, 0, x_127);
+lean_ctor_set(x_130, 1, x_128);
+return x_130;
+}
+}
 }
 else
 {
-lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; 
-x_127 = lean_ctor_get(x_6, 0);
-lean_inc(x_127);
-lean_dec(x_6);
-x_128 = lean_ctor_get(x_21, 0);
-lean_inc(x_128);
-x_129 = lean_ctor_get(x_21, 1);
-lean_inc(x_129);
-lean_dec(x_21);
-x_130 = lean_ctor_get(x_127, 0);
-lean_inc(x_130);
-x_131 = lean_ctor_get(x_127, 1);
+lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; 
+x_131 = lean_ctor_get(x_6, 0);
 lean_inc(x_131);
-if (lean_is_exclusive(x_127)) {
- lean_ctor_release(x_127, 0);
- lean_ctor_release(x_127, 1);
- x_132 = x_127;
+lean_dec(x_6);
+x_132 = lean_ctor_get(x_21, 0);
+lean_inc(x_132);
+x_133 = lean_ctor_get(x_21, 1);
+lean_inc(x_133);
+lean_dec(x_21);
+x_134 = lean_ctor_get(x_131, 0);
+lean_inc(x_134);
+x_135 = lean_ctor_get(x_131, 1);
+lean_inc(x_135);
+if (lean_is_exclusive(x_131)) {
+ lean_ctor_release(x_131, 0);
+ lean_ctor_release(x_131, 1);
+ x_136 = x_131;
 } else {
- lean_dec_ref(x_127);
- x_132 = lean_box(0);
+ lean_dec_ref(x_131);
+ x_136 = lean_box(0);
 }
 lean_inc(x_13);
 lean_inc(x_12);
 lean_inc(x_11);
 lean_inc(x_10);
-x_133 = l_Lean_Elab_Term_synthesizeSyntheticMVarsUsingDefault(x_8, x_9, x_10, x_11, x_12, x_13, x_129);
-if (lean_obj_tag(x_133) == 0)
+x_137 = l_Lean_Elab_Term_synthesizeSyntheticMVarsUsingDefault(x_8, x_9, x_10, x_11, x_12, x_13, x_133);
+if (lean_obj_tag(x_137) == 0)
 {
-lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; uint8_t x_146; lean_object* x_147; lean_object* x_148; lean_object* x_149; lean_object* x_150; 
-x_134 = lean_ctor_get(x_133, 1);
-lean_inc(x_134);
-lean_dec(x_133);
-x_135 = lean_ctor_get(x_12, 0);
-lean_inc(x_135);
-x_136 = lean_ctor_get(x_12, 1);
-lean_inc(x_136);
-x_137 = lean_ctor_get(x_12, 2);
-lean_inc(x_137);
-x_138 = lean_ctor_get(x_12, 3);
+lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; lean_object* x_148; lean_object* x_149; uint8_t x_150; lean_object* x_151; uint8_t x_152; lean_object* x_153; lean_object* x_154; lean_object* x_155; lean_object* x_156; 
+x_138 = lean_ctor_get(x_137, 1);
 lean_inc(x_138);
-x_139 = lean_ctor_get(x_12, 4);
+lean_dec(x_137);
+x_139 = lean_ctor_get(x_12, 0);
 lean_inc(x_139);
-x_140 = lean_ctor_get(x_12, 5);
+x_140 = lean_ctor_get(x_12, 1);
 lean_inc(x_140);
-x_141 = lean_ctor_get(x_12, 6);
+x_141 = lean_ctor_get(x_12, 2);
 lean_inc(x_141);
-x_142 = lean_ctor_get(x_12, 7);
+x_142 = lean_ctor_get(x_12, 3);
 lean_inc(x_142);
-x_143 = lean_ctor_get(x_12, 8);
+x_143 = lean_ctor_get(x_12, 4);
 lean_inc(x_143);
-x_144 = lean_ctor_get(x_12, 9);
+x_144 = lean_ctor_get(x_12, 5);
 lean_inc(x_144);
-x_145 = lean_ctor_get(x_12, 10);
+x_145 = lean_ctor_get(x_12, 6);
 lean_inc(x_145);
-x_146 = lean_ctor_get_uint8(x_12, sizeof(void*)*11);
+x_146 = lean_ctor_get(x_12, 7);
+lean_inc(x_146);
+x_147 = lean_ctor_get(x_12, 8);
+lean_inc(x_147);
+x_148 = lean_ctor_get(x_12, 9);
+lean_inc(x_148);
+x_149 = lean_ctor_get(x_12, 10);
+lean_inc(x_149);
+x_150 = lean_ctor_get_uint8(x_12, sizeof(void*)*12);
+x_151 = lean_ctor_get(x_12, 11);
+lean_inc(x_151);
+x_152 = lean_ctor_get_uint8(x_12, sizeof(void*)*12 + 1);
 if (lean_is_exclusive(x_12)) {
  lean_ctor_release(x_12, 0);
  lean_ctor_release(x_12, 1);
@@ -15535,135 +15549,138 @@ if (lean_is_exclusive(x_12)) {
  lean_ctor_release(x_12, 8);
  lean_ctor_release(x_12, 9);
  lean_ctor_release(x_12, 10);
- x_147 = x_12;
+ lean_ctor_release(x_12, 11);
+ x_153 = x_12;
 } else {
  lean_dec_ref(x_12);
- x_147 = lean_box(0);
-}
-x_148 = l_Lean_replaceRef(x_4, x_140);
-lean_dec(x_140);
-if (lean_is_scalar(x_147)) {
- x_149 = lean_alloc_ctor(0, 11, 1);
-} else {
- x_149 = x_147;
-}
-lean_ctor_set(x_149, 0, x_135);
-lean_ctor_set(x_149, 1, x_136);
-lean_ctor_set(x_149, 2, x_137);
-lean_ctor_set(x_149, 3, x_138);
-lean_ctor_set(x_149, 4, x_139);
-lean_ctor_set(x_149, 5, x_148);
-lean_ctor_set(x_149, 6, x_141);
-lean_ctor_set(x_149, 7, x_142);
-lean_ctor_set(x_149, 8, x_143);
-lean_ctor_set(x_149, 9, x_144);
-lean_ctor_set(x_149, 10, x_145);
-lean_ctor_set_uint8(x_149, sizeof(void*)*11, x_146);
-x_150 = l_Lean_Elab_Term_mkCalcTrans(x_130, x_131, x_128, x_1, x_10, x_11, x_149, x_13, x_134);
-if (lean_obj_tag(x_150) == 0)
-{
-lean_object* x_151; lean_object* x_152; lean_object* x_153; lean_object* x_154; lean_object* x_155; lean_object* x_156; lean_object* x_157; lean_object* x_158; 
-x_151 = lean_ctor_get(x_150, 0);
-lean_inc(x_151);
-x_152 = lean_ctor_get(x_150, 1);
-lean_inc(x_152);
-if (lean_is_exclusive(x_150)) {
- lean_ctor_release(x_150, 0);
- lean_ctor_release(x_150, 1);
- x_153 = x_150;
-} else {
- lean_dec_ref(x_150);
  x_153 = lean_box(0);
 }
-x_154 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_154, 0, x_151);
-x_155 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_155, 0, x_3);
-if (lean_is_scalar(x_132)) {
- x_156 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_156 = x_132;
-}
-lean_ctor_set(x_156, 0, x_155);
-lean_ctor_set(x_156, 1, x_154);
-x_157 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_157, 0, x_156);
+x_154 = l_Lean_replaceRef(x_4, x_144);
+lean_dec(x_144);
 if (lean_is_scalar(x_153)) {
- x_158 = lean_alloc_ctor(0, 2, 0);
+ x_155 = lean_alloc_ctor(0, 12, 2);
 } else {
- x_158 = x_153;
+ x_155 = x_153;
 }
-lean_ctor_set(x_158, 0, x_157);
-lean_ctor_set(x_158, 1, x_152);
-return x_158;
-}
-else
+lean_ctor_set(x_155, 0, x_139);
+lean_ctor_set(x_155, 1, x_140);
+lean_ctor_set(x_155, 2, x_141);
+lean_ctor_set(x_155, 3, x_142);
+lean_ctor_set(x_155, 4, x_143);
+lean_ctor_set(x_155, 5, x_154);
+lean_ctor_set(x_155, 6, x_145);
+lean_ctor_set(x_155, 7, x_146);
+lean_ctor_set(x_155, 8, x_147);
+lean_ctor_set(x_155, 9, x_148);
+lean_ctor_set(x_155, 10, x_149);
+lean_ctor_set(x_155, 11, x_151);
+lean_ctor_set_uint8(x_155, sizeof(void*)*12, x_150);
+lean_ctor_set_uint8(x_155, sizeof(void*)*12 + 1, x_152);
+x_156 = l_Lean_Elab_Term_mkCalcTrans(x_134, x_135, x_132, x_1, x_10, x_11, x_155, x_13, x_138);
+if (lean_obj_tag(x_156) == 0)
 {
-lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; 
-lean_dec(x_132);
-lean_dec(x_3);
-x_159 = lean_ctor_get(x_150, 0);
-lean_inc(x_159);
-x_160 = lean_ctor_get(x_150, 1);
-lean_inc(x_160);
-if (lean_is_exclusive(x_150)) {
- lean_ctor_release(x_150, 0);
- lean_ctor_release(x_150, 1);
- x_161 = x_150;
+lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; 
+x_157 = lean_ctor_get(x_156, 0);
+lean_inc(x_157);
+x_158 = lean_ctor_get(x_156, 1);
+lean_inc(x_158);
+if (lean_is_exclusive(x_156)) {
+ lean_ctor_release(x_156, 0);
+ lean_ctor_release(x_156, 1);
+ x_159 = x_156;
 } else {
- lean_dec_ref(x_150);
- x_161 = lean_box(0);
+ lean_dec_ref(x_156);
+ x_159 = lean_box(0);
 }
-if (lean_is_scalar(x_161)) {
- x_162 = lean_alloc_ctor(1, 2, 0);
+x_160 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_160, 0, x_157);
+x_161 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_161, 0, x_3);
+if (lean_is_scalar(x_136)) {
+ x_162 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_162 = x_161;
+ x_162 = x_136;
 }
-lean_ctor_set(x_162, 0, x_159);
+lean_ctor_set(x_162, 0, x_161);
 lean_ctor_set(x_162, 1, x_160);
-return x_162;
+x_163 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_163, 0, x_162);
+if (lean_is_scalar(x_159)) {
+ x_164 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_164 = x_159;
+}
+lean_ctor_set(x_164, 0, x_163);
+lean_ctor_set(x_164, 1, x_158);
+return x_164;
+}
+else
+{
+lean_object* x_165; lean_object* x_166; lean_object* x_167; lean_object* x_168; 
+lean_dec(x_136);
+lean_dec(x_3);
+x_165 = lean_ctor_get(x_156, 0);
+lean_inc(x_165);
+x_166 = lean_ctor_get(x_156, 1);
+lean_inc(x_166);
+if (lean_is_exclusive(x_156)) {
+ lean_ctor_release(x_156, 0);
+ lean_ctor_release(x_156, 1);
+ x_167 = x_156;
+} else {
+ lean_dec_ref(x_156);
+ x_167 = lean_box(0);
+}
+if (lean_is_scalar(x_167)) {
+ x_168 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_168 = x_167;
+}
+lean_ctor_set(x_168, 0, x_165);
+lean_ctor_set(x_168, 1, x_166);
+return x_168;
 }
 }
 else
 {
-lean_object* x_163; lean_object* x_164; lean_object* x_165; lean_object* x_166; 
+lean_object* x_169; lean_object* x_170; lean_object* x_171; lean_object* x_172; 
+lean_dec(x_136);
+lean_dec(x_135);
+lean_dec(x_134);
 lean_dec(x_132);
-lean_dec(x_131);
-lean_dec(x_130);
-lean_dec(x_128);
 lean_dec(x_13);
 lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_3);
 lean_dec(x_1);
-x_163 = lean_ctor_get(x_133, 0);
-lean_inc(x_163);
-x_164 = lean_ctor_get(x_133, 1);
-lean_inc(x_164);
-if (lean_is_exclusive(x_133)) {
- lean_ctor_release(x_133, 0);
- lean_ctor_release(x_133, 1);
- x_165 = x_133;
+x_169 = lean_ctor_get(x_137, 0);
+lean_inc(x_169);
+x_170 = lean_ctor_get(x_137, 1);
+lean_inc(x_170);
+if (lean_is_exclusive(x_137)) {
+ lean_ctor_release(x_137, 0);
+ lean_ctor_release(x_137, 1);
+ x_171 = x_137;
 } else {
- lean_dec_ref(x_133);
- x_165 = lean_box(0);
+ lean_dec_ref(x_137);
+ x_171 = lean_box(0);
 }
-if (lean_is_scalar(x_165)) {
- x_166 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_171)) {
+ x_172 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_166 = x_165;
+ x_172 = x_171;
 }
-lean_ctor_set(x_166, 0, x_163);
-lean_ctor_set(x_166, 1, x_164);
-return x_166;
+lean_ctor_set(x_172, 0, x_169);
+lean_ctor_set(x_172, 1, x_170);
+return x_172;
 }
 }
 }
 }
 else
 {
-uint8_t x_167; 
+uint8_t x_173; 
 lean_dec(x_13);
 lean_dec(x_12);
 lean_dec(x_11);
@@ -15673,23 +15690,23 @@ lean_dec(x_8);
 lean_dec(x_6);
 lean_dec(x_3);
 lean_dec(x_1);
-x_167 = !lean_is_exclusive(x_21);
-if (x_167 == 0)
+x_173 = !lean_is_exclusive(x_21);
+if (x_173 == 0)
 {
 return x_21;
 }
 else
 {
-lean_object* x_168; lean_object* x_169; lean_object* x_170; 
-x_168 = lean_ctor_get(x_21, 0);
-x_169 = lean_ctor_get(x_21, 1);
-lean_inc(x_169);
-lean_inc(x_168);
+lean_object* x_174; lean_object* x_175; lean_object* x_176; 
+x_174 = lean_ctor_get(x_21, 0);
+x_175 = lean_ctor_get(x_21, 1);
+lean_inc(x_175);
+lean_inc(x_174);
 lean_dec(x_21);
-x_170 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_170, 0, x_168);
-lean_ctor_set(x_170, 1, x_169);
-return x_170;
+x_176 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_176, 0, x_174);
+lean_ctor_set(x_176, 1, x_175);
+return x_176;
 }
 }
 }

stage0/stdlib/Lean/Elab/CheckTactic.c

@@ -29,6 +29,7 @@ LEAN_EXPORT lean_object* l_Lean_Elab_CheckTactic_elabCheckTactic___lambda__2___b
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_Elab_CheckTactic_expandCheckSimp_declRange(lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_CheckTactic_expandCheckSimp_declRange___closed__6;
 static lean_object* l_Lean_Elab_CheckTactic_elabCheckTactic___lambda__2___closed__4;
+uint8_t l_Lean_Exception_isInterrupt(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_CheckTactic_elabCheckTacticFailure___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabTerm(lean_object*, lean_object*, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_isExprDefEq(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -361,7 +362,7 @@ x_4 = 1;
 x_5 = 0;
 x_6 = l_Lean_Elab_CheckTactic_elabCheckTactic___lambda__2___closed__3;
 x_7 = l_Lean_Elab_CheckTactic_elabCheckTactic___lambda__2___closed__4;
-x_8 = lean_alloc_ctor(0, 8, 10);
+x_8 = lean_alloc_ctor(0, 9, 10);
 lean_ctor_set(x_8, 0, x_1);
 lean_ctor_set(x_8, 1, x_2);
 lean_ctor_set(x_8, 2, x_3);
@@ -370,16 +371,17 @@ lean_ctor_set(x_8, 4, x_7);
 lean_ctor_set(x_8, 5, x_2);
 lean_ctor_set(x_8, 6, x_2);
 lean_ctor_set(x_8, 7, x_1);
-lean_ctor_set_uint8(x_8, sizeof(void*)*8, x_4);
-lean_ctor_set_uint8(x_8, sizeof(void*)*8 + 1, x_4);
-lean_ctor_set_uint8(x_8, sizeof(void*)*8 + 2, x_5);
-lean_ctor_set_uint8(x_8, sizeof(void*)*8 + 3, x_4);
-lean_ctor_set_uint8(x_8, sizeof(void*)*8 + 4, x_4);
-lean_ctor_set_uint8(x_8, sizeof(void*)*8 + 5, x_5);
-lean_ctor_set_uint8(x_8, sizeof(void*)*8 + 6, x_5);
-lean_ctor_set_uint8(x_8, sizeof(void*)*8 + 7, x_5);
-lean_ctor_set_uint8(x_8, sizeof(void*)*8 + 8, x_4);
-lean_ctor_set_uint8(x_8, sizeof(void*)*8 + 9, x_5);
+lean_ctor_set(x_8, 8, x_1);
+lean_ctor_set_uint8(x_8, sizeof(void*)*9, x_4);
+lean_ctor_set_uint8(x_8, sizeof(void*)*9 + 1, x_4);
+lean_ctor_set_uint8(x_8, sizeof(void*)*9 + 2, x_5);
+lean_ctor_set_uint8(x_8, sizeof(void*)*9 + 3, x_4);
+lean_ctor_set_uint8(x_8, sizeof(void*)*9 + 4, x_4);
+lean_ctor_set_uint8(x_8, sizeof(void*)*9 + 5, x_5);
+lean_ctor_set_uint8(x_8, sizeof(void*)*9 + 6, x_5);
+lean_ctor_set_uint8(x_8, sizeof(void*)*9 + 7, x_5);
+lean_ctor_set_uint8(x_8, sizeof(void*)*9 + 8, x_4);
+lean_ctor_set_uint8(x_8, sizeof(void*)*9 + 9, x_5);
 return x_8;
 }
 }
@@ -4181,9 +4183,13 @@ if (x_231 == 0)
 lean_object* x_232; lean_object* x_233; uint8_t x_234; 
 x_232 = lean_ctor_get(x_228, 0);
 x_233 = lean_ctor_get(x_228, 1);
-x_234 = l_Lean_Exception_isRuntime(x_232);
+x_234 = l_Lean_Exception_isInterrupt(x_232);
 if (x_234 == 0)
 {
+uint8_t x_235; 
+x_235 = l_Lean_Exception_isRuntime(x_232);
+if (x_235 == 0)
+{
 lean_free_object(x_228);
 lean_dec(x_232);
 x_35 = x_12;
@@ -4208,23 +4214,6 @@ return x_228;
 }
 else
 {
-lean_object* x_235; lean_object* x_236; uint8_t x_237; 
-x_235 = lean_ctor_get(x_228, 0);
-x_236 = lean_ctor_get(x_228, 1);
-lean_inc(x_236);
-lean_inc(x_235);
-lean_dec(x_228);
-x_237 = l_Lean_Exception_isRuntime(x_235);
-if (x_237 == 0)
-{
-lean_dec(x_235);
-x_35 = x_12;
-x_36 = x_236;
-goto block_227;
-}
-else
-{
-lean_object* x_238; 
 lean_dec(x_30);
 lean_dec(x_23);
 lean_dec(x_10);
@@ -4236,10 +4225,67 @@ lean_dec(x_5);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_238 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_238, 0, x_235);
-lean_ctor_set(x_238, 1, x_236);
-return x_238;
+return x_228;
+}
+}
+else
+{
+lean_object* x_236; lean_object* x_237; uint8_t x_238; 
+x_236 = lean_ctor_get(x_228, 0);
+x_237 = lean_ctor_get(x_228, 1);
+lean_inc(x_237);
+lean_inc(x_236);
+lean_dec(x_228);
+x_238 = l_Lean_Exception_isInterrupt(x_236);
+if (x_238 == 0)
+{
+uint8_t x_239; 
+x_239 = l_Lean_Exception_isRuntime(x_236);
+if (x_239 == 0)
+{
+lean_dec(x_236);
+x_35 = x_12;
+x_36 = x_237;
+goto block_227;
+}
+else
+{
+lean_object* x_240; 
+lean_dec(x_30);
+lean_dec(x_23);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_240 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_240, 0, x_236);
+lean_ctor_set(x_240, 1, x_237);
+return x_240;
+}
+}
+else
+{
+lean_object* x_241; 
+lean_dec(x_30);
+lean_dec(x_23);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_241 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_241, 0, x_236);
+lean_ctor_set(x_241, 1, x_237);
+return x_241;
 }
 }
 }
@@ -5165,7 +5211,7 @@ return x_226;
 }
 else
 {
-uint8_t x_239; 
+uint8_t x_242; 
 lean_dec(x_15);
 lean_dec(x_10);
 lean_dec(x_9);
@@ -5176,29 +5222,29 @@ lean_dec(x_5);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_239 = !lean_is_exclusive(x_17);
-if (x_239 == 0)
+x_242 = !lean_is_exclusive(x_17);
+if (x_242 == 0)
 {
 return x_17;
 }
 else
 {
-lean_object* x_240; lean_object* x_241; lean_object* x_242; 
-x_240 = lean_ctor_get(x_17, 0);
-x_241 = lean_ctor_get(x_17, 1);
-lean_inc(x_241);
-lean_inc(x_240);
+lean_object* x_243; lean_object* x_244; lean_object* x_245; 
+x_243 = lean_ctor_get(x_17, 0);
+x_244 = lean_ctor_get(x_17, 1);
+lean_inc(x_244);
+lean_inc(x_243);
 lean_dec(x_17);
-x_242 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_242, 0, x_240);
-lean_ctor_set(x_242, 1, x_241);
-return x_242;
+x_245 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_245, 0, x_243);
+lean_ctor_set(x_245, 1, x_244);
+return x_245;
 }
 }
 }
 else
 {
-uint8_t x_243; 
+uint8_t x_246; 
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
@@ -5208,23 +5254,23 @@ lean_dec(x_5);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_243 = !lean_is_exclusive(x_14);
-if (x_243 == 0)
+x_246 = !lean_is_exclusive(x_14);
+if (x_246 == 0)
 {
 return x_14;
 }
 else
 {
-lean_object* x_244; lean_object* x_245; lean_object* x_246; 
-x_244 = lean_ctor_get(x_14, 0);
-x_245 = lean_ctor_get(x_14, 1);
-lean_inc(x_245);
-lean_inc(x_244);
+lean_object* x_247; lean_object* x_248; lean_object* x_249; 
+x_247 = lean_ctor_get(x_14, 0);
+x_248 = lean_ctor_get(x_14, 1);
+lean_inc(x_248);
+lean_inc(x_247);
 lean_dec(x_14);
-x_246 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_246, 0, x_244);
-lean_ctor_set(x_246, 1, x_245);
-return x_246;
+x_249 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_249, 0, x_247);
+lean_ctor_set(x_249, 1, x_248);
+return x_249;
 }
 }
 }

stage0/stdlib/Lean/Elab/DeclNameGen.c

@@ -31,6 +31,7 @@ lean_object* l_Lean_throwError___at_Lean_Elab_Term_mkAuxName___spec__1(lean_obje
 lean_object* lean_whnf(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_DeclNameGen_0__Lean_Elab_Command_NameGen_winnowExpr_visit___lambda__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_maxRecDepthErrorMessage;
+uint8_t l_Lean_Exception_isInterrupt(lean_object*);
 static lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_DeclNameGen_0__Lean_Elab_Command_NameGen_winnowExpr_visit___spec__3___lambda__1___closed__1;
 LEAN_EXPORT lean_object* l_Lean_findModuleOf_x3f___at_Lean_Elab_Command_NameGen_mkBaseNameWithSuffix___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_NameGen_mkBaseNameWithSuffix_x27___spec__4___rarg___closed__1;
@@ -5521,7 +5522,7 @@ return x_13;
 }
 else
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; 
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; lean_object* x_26; uint8_t x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; 
 x_14 = lean_ctor_get(x_7, 0);
 x_15 = lean_ctor_get(x_7, 1);
 x_16 = lean_ctor_get(x_7, 2);
@@ -5533,7 +5534,10 @@ x_21 = lean_ctor_get(x_7, 7);
 x_22 = lean_ctor_get(x_7, 8);
 x_23 = lean_ctor_get(x_7, 9);
 x_24 = lean_ctor_get(x_7, 10);
-x_25 = lean_ctor_get_uint8(x_7, sizeof(void*)*11);
+x_25 = lean_ctor_get_uint8(x_7, sizeof(void*)*12);
+x_26 = lean_ctor_get(x_7, 11);
+x_27 = lean_ctor_get_uint8(x_7, sizeof(void*)*12 + 1);
+lean_inc(x_26);
 lean_inc(x_24);
 lean_inc(x_23);
 lean_inc(x_22);
@@ -5546,24 +5550,26 @@ lean_inc(x_16);
 lean_inc(x_15);
 lean_inc(x_14);
 lean_dec(x_7);
-x_26 = l_Lean_replaceRef(x_1, x_19);
+x_28 = l_Lean_replaceRef(x_1, x_19);
 lean_dec(x_19);
-x_27 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_27, 0, x_14);
-lean_ctor_set(x_27, 1, x_15);
-lean_ctor_set(x_27, 2, x_16);
-lean_ctor_set(x_27, 3, x_17);
-lean_ctor_set(x_27, 4, x_18);
-lean_ctor_set(x_27, 5, x_26);
-lean_ctor_set(x_27, 6, x_20);
-lean_ctor_set(x_27, 7, x_21);
-lean_ctor_set(x_27, 8, x_22);
-lean_ctor_set(x_27, 9, x_23);
-lean_ctor_set(x_27, 10, x_24);
-lean_ctor_set_uint8(x_27, sizeof(void*)*11, x_25);
-x_28 = l_Lean_throwError___at_Lean_Elab_Term_mkAuxName___spec__1(x_2, x_3, x_4, x_5, x_6, x_27, x_8, x_9);
-lean_dec(x_27);
-return x_28;
+x_29 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_29, 0, x_14);
+lean_ctor_set(x_29, 1, x_15);
+lean_ctor_set(x_29, 2, x_16);
+lean_ctor_set(x_29, 3, x_17);
+lean_ctor_set(x_29, 4, x_18);
+lean_ctor_set(x_29, 5, x_28);
+lean_ctor_set(x_29, 6, x_20);
+lean_ctor_set(x_29, 7, x_21);
+lean_ctor_set(x_29, 8, x_22);
+lean_ctor_set(x_29, 9, x_23);
+lean_ctor_set(x_29, 10, x_24);
+lean_ctor_set(x_29, 11, x_26);
+lean_ctor_set_uint8(x_29, sizeof(void*)*12, x_25);
+lean_ctor_set_uint8(x_29, sizeof(void*)*12 + 1, x_27);
+x_30 = l_Lean_throwError___at_Lean_Elab_Term_mkAuxName___spec__1(x_2, x_3, x_4, x_5, x_6, x_29, x_8, x_9);
+lean_dec(x_29);
+return x_30;
 }
 }
 }
@@ -6433,14 +6439,18 @@ if (x_18 == 0)
 lean_object* x_19; lean_object* x_20; uint8_t x_21; 
 x_19 = lean_ctor_get(x_14, 0);
 x_20 = lean_ctor_get(x_14, 1);
-x_21 = l_Lean_Exception_isRuntime(x_19);
+x_21 = l_Lean_Exception_isInterrupt(x_19);
 if (x_21 == 0)
 {
-lean_object* x_22; 
+uint8_t x_22; 
+x_22 = l_Lean_Exception_isRuntime(x_19);
+if (x_22 == 0)
+{
+lean_object* x_23; 
 lean_free_object(x_14);
 lean_dec(x_19);
-x_22 = lean_apply_8(x_11, x_1, x_4, x_5, x_6, x_7, x_8, x_9, x_20);
-return x_22;
+x_23 = lean_apply_8(x_11, x_1, x_4, x_5, x_6, x_7, x_8, x_9, x_20);
+return x_23;
 }
 else
 {
@@ -6456,23 +6466,6 @@ return x_14;
 }
 else
 {
-lean_object* x_23; lean_object* x_24; uint8_t x_25; 
-x_23 = lean_ctor_get(x_14, 0);
-x_24 = lean_ctor_get(x_14, 1);
-lean_inc(x_24);
-lean_inc(x_23);
-lean_dec(x_14);
-x_25 = l_Lean_Exception_isRuntime(x_23);
-if (x_25 == 0)
-{
-lean_object* x_26; 
-lean_dec(x_23);
-x_26 = lean_apply_8(x_11, x_1, x_4, x_5, x_6, x_7, x_8, x_9, x_24);
-return x_26;
-}
-else
-{
-lean_object* x_27; 
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
@@ -6480,10 +6473,59 @@ lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_1);
-x_27 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_27, 0, x_23);
-lean_ctor_set(x_27, 1, x_24);
-return x_27;
+return x_14;
+}
+}
+else
+{
+lean_object* x_24; lean_object* x_25; uint8_t x_26; 
+x_24 = lean_ctor_get(x_14, 0);
+x_25 = lean_ctor_get(x_14, 1);
+lean_inc(x_25);
+lean_inc(x_24);
+lean_dec(x_14);
+x_26 = l_Lean_Exception_isInterrupt(x_24);
+if (x_26 == 0)
+{
+uint8_t x_27; 
+x_27 = l_Lean_Exception_isRuntime(x_24);
+if (x_27 == 0)
+{
+lean_object* x_28; 
+lean_dec(x_24);
+x_28 = lean_apply_8(x_11, x_1, x_4, x_5, x_6, x_7, x_8, x_9, x_25);
+return x_28;
+}
+else
+{
+lean_object* x_29; 
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_1);
+x_29 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_29, 0, x_24);
+lean_ctor_set(x_29, 1, x_25);
+return x_29;
+}
+}
+else
+{
+lean_object* x_30; 
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_1);
+x_30 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_30, 0, x_24);
+lean_ctor_set(x_30, 1, x_25);
+return x_30;
 }
 }
 }

stage0/stdlib/Lean/Elab/Deriving/Inhabited.c

@@ -44,6 +44,7 @@ static lean_object* l___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInha
 static lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_mkInstanceCmdWith___spec__6___closed__10;
 static lean_object* l___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_mkInstanceCmd_x3f___lambda__3___closed__4;
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_mkInstanceCmd_x3f___lambda__4(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+uint8_t l_Lean_Exception_isInterrupt(lean_object*);
 static lean_object* l_Lean_Elab_initFn____x40_Lean_Elab_Deriving_Inhabited___hyg_2605____closed__13;
 LEAN_EXPORT lean_object* l_Lean_throwError___at___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_mkInstanceCmdWith___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_mkInstanceCmdWith___spec__6___closed__18;
@@ -567,51 +568,57 @@ return x_12;
 }
 else
 {
-lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; 
+lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_28; lean_object* x_29; 
 x_13 = lean_ctor_get(x_2, 0);
 lean_inc(x_13);
 x_14 = lean_ctor_get(x_2, 1);
 lean_inc(x_14);
-lean_dec(x_2);
-x_15 = l___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_addLocalInstancesForParamsAux___rarg___closed__3;
-x_16 = lean_array_push(x_15, x_13);
-x_17 = l___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_addLocalInstancesForParamsAux___rarg___closed__2;
+if (lean_is_exclusive(x_2)) {
+ lean_ctor_release(x_2, 0);
+ lean_ctor_release(x_2, 1);
+ x_15 = x_2;
+} else {
+ lean_dec_ref(x_2);
+ x_15 = lean_box(0);
+}
+x_16 = l___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_addLocalInstancesForParamsAux___rarg___closed__3;
+x_17 = lean_array_push(x_16, x_13);
+x_28 = l___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_addLocalInstancesForParamsAux___rarg___closed__2;
 lean_inc(x_10);
 lean_inc(x_9);
 lean_inc(x_8);
 lean_inc(x_7);
-x_18 = l_Lean_Meta_mkAppM(x_17, x_16, x_7, x_8, x_9, x_10, x_11);
-if (lean_obj_tag(x_18) == 0)
+x_29 = l_Lean_Meta_mkAppM(x_28, x_17, x_7, x_8, x_9, x_10, x_11);
+if (lean_obj_tag(x_29) == 0)
 {
-lean_object* x_19; lean_object* x_20; lean_object* x_21; 
-x_19 = lean_ctor_get(x_18, 0);
-lean_inc(x_19);
-x_20 = lean_ctor_get(x_18, 1);
-lean_inc(x_20);
-lean_dec(x_18);
+lean_object* x_30; lean_object* x_31; lean_object* x_32; 
+x_30 = lean_ctor_get(x_29, 0);
+lean_inc(x_30);
+x_31 = lean_ctor_get(x_29, 1);
+lean_inc(x_31);
+lean_dec(x_29);
 lean_inc(x_10);
 lean_inc(x_9);
 lean_inc(x_8);
 lean_inc(x_7);
-lean_inc(x_19);
-x_21 = l_Lean_Meta_isTypeCorrect(x_19, x_7, x_8, x_9, x_10, x_20);
-if (lean_obj_tag(x_21) == 0)
+lean_inc(x_30);
+x_32 = l_Lean_Meta_isTypeCorrect(x_30, x_7, x_8, x_9, x_10, x_31);
+if (lean_obj_tag(x_32) == 0)
 {
-lean_object* x_22; uint8_t x_23; 
-x_22 = lean_ctor_get(x_21, 0);
-lean_inc(x_22);
-x_23 = lean_unbox(x_22);
-lean_dec(x_22);
-if (x_23 == 0)
+lean_object* x_33; uint8_t x_34; 
+x_33 = lean_ctor_get(x_32, 0);
+lean_inc(x_33);
+x_34 = lean_unbox(x_33);
+lean_dec(x_33);
+if (x_34 == 0)
 {
-lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; 
-lean_dec(x_19);
-x_24 = lean_ctor_get(x_21, 1);
-lean_inc(x_24);
-lean_dec(x_21);
-x_25 = lean_unsigned_to_nat(1u);
-x_26 = lean_nat_add(x_3, x_25);
-lean_dec(x_3);
+lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; 
+lean_dec(x_30);
+x_35 = lean_ctor_get(x_32, 1);
+lean_inc(x_35);
+lean_dec(x_32);
+x_36 = lean_unsigned_to_nat(1u);
+x_37 = lean_nat_add(x_3, x_36);
 lean_inc(x_10);
 lean_inc(x_9);
 lean_inc(x_8);
@@ -619,13 +626,12 @@ lean_inc(x_7);
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
-lean_inc(x_26);
 lean_inc(x_14);
 lean_inc(x_1);
-x_27 = l___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_addLocalInstancesForParamsAux___rarg(x_1, x_14, x_26, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_24);
-if (lean_obj_tag(x_27) == 0)
+x_38 = l___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_addLocalInstancesForParamsAux___rarg(x_1, x_14, x_37, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_35);
+if (lean_obj_tag(x_38) == 0)
 {
-lean_dec(x_26);
+lean_dec(x_15);
 lean_dec(x_14);
 lean_dec(x_10);
 lean_dec(x_9);
@@ -634,116 +640,59 @@ lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
+lean_dec(x_3);
 lean_dec(x_1);
-return x_27;
+return x_38;
 }
 else
 {
-uint8_t x_28; 
-x_28 = !lean_is_exclusive(x_27);
-if (x_28 == 0)
-{
-lean_object* x_29; lean_object* x_30; uint8_t x_31; 
-x_29 = lean_ctor_get(x_27, 0);
-x_30 = lean_ctor_get(x_27, 1);
-x_31 = l_Lean_Exception_isRuntime(x_29);
-if (x_31 == 0)
-{
-lean_free_object(x_27);
-lean_dec(x_29);
-x_2 = x_14;
-x_3 = x_26;
-x_11 = x_30;
-goto _start;
-}
-else
-{
-lean_dec(x_26);
-lean_dec(x_14);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_1);
-return x_27;
+lean_object* x_39; lean_object* x_40; 
+x_39 = lean_ctor_get(x_38, 0);
+lean_inc(x_39);
+x_40 = lean_ctor_get(x_38, 1);
+lean_inc(x_40);
+lean_dec(x_38);
+x_18 = x_39;
+x_19 = x_40;
+goto block_27;
 }
 }
 else
 {
-lean_object* x_33; lean_object* x_34; uint8_t x_35; 
-x_33 = lean_ctor_get(x_27, 0);
-x_34 = lean_ctor_get(x_27, 1);
-lean_inc(x_34);
-lean_inc(x_33);
-lean_dec(x_27);
-x_35 = l_Lean_Exception_isRuntime(x_33);
-if (x_35 == 0)
-{
-lean_dec(x_33);
-x_2 = x_14;
-x_3 = x_26;
-x_11 = x_34;
-goto _start;
-}
-else
-{
-lean_object* x_37; 
-lean_dec(x_26);
-lean_dec(x_14);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_1);
-x_37 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_37, 0, x_33);
-lean_ctor_set(x_37, 1, x_34);
-return x_37;
-}
-}
-}
-}
-else
-{
-lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; uint8_t x_44; uint8_t x_45; lean_object* x_46; 
-x_38 = lean_ctor_get(x_21, 1);
-lean_inc(x_38);
-lean_dec(x_21);
-x_39 = l___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_addLocalInstancesForParamsAux___rarg___closed__5;
-x_40 = l___private_Lean_CoreM_0__Lean_Core_mkFreshNameImp(x_39, x_9, x_10, x_38);
-x_41 = lean_ctor_get(x_40, 0);
+lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; uint8_t x_47; uint8_t x_48; lean_object* x_49; 
+x_41 = lean_ctor_get(x_32, 1);
 lean_inc(x_41);
-x_42 = lean_ctor_get(x_40, 1);
-lean_inc(x_42);
-lean_dec(x_40);
-lean_inc(x_19);
+lean_dec(x_32);
+x_42 = l___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_addLocalInstancesForParamsAux___rarg___closed__5;
+x_43 = l___private_Lean_CoreM_0__Lean_Core_mkFreshNameImp(x_42, x_9, x_10, x_41);
+x_44 = lean_ctor_get(x_43, 0);
+lean_inc(x_44);
+x_45 = lean_ctor_get(x_43, 1);
+lean_inc(x_45);
+lean_dec(x_43);
+lean_inc(x_30);
 lean_inc(x_14);
 lean_inc(x_1);
 lean_inc(x_4);
 lean_inc(x_3);
-x_43 = lean_alloc_closure((void*)(l___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_addLocalInstancesForParamsAux___rarg___lambda__2), 13, 5);
-lean_closure_set(x_43, 0, x_3);
-lean_closure_set(x_43, 1, x_4);
-lean_closure_set(x_43, 2, x_1);
-lean_closure_set(x_43, 3, x_14);
-lean_closure_set(x_43, 4, x_19);
-x_44 = 0;
-x_45 = 0;
+x_46 = lean_alloc_closure((void*)(l___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_addLocalInstancesForParamsAux___rarg___lambda__2), 13, 5);
+lean_closure_set(x_46, 0, x_3);
+lean_closure_set(x_46, 1, x_4);
+lean_closure_set(x_46, 2, x_1);
+lean_closure_set(x_46, 3, x_14);
+lean_closure_set(x_46, 4, x_30);
+x_47 = 0;
+x_48 = 0;
 lean_inc(x_10);
 lean_inc(x_9);
 lean_inc(x_8);
 lean_inc(x_7);
 lean_inc(x_6);
 lean_inc(x_5);
-x_46 = l_Lean_Meta_withLocalDecl___at_Lean_Elab_Term_withAuxDecl___spec__1___rarg(x_41, x_44, x_19, x_43, x_45, x_5, x_6, x_7, x_8, x_9, x_10, x_42);
-if (lean_obj_tag(x_46) == 0)
+x_49 = l_Lean_Meta_withLocalDecl___at_Lean_Elab_Term_withAuxDecl___spec__1___rarg(x_44, x_47, x_30, x_46, x_48, x_5, x_6, x_7, x_8, x_9, x_10, x_45);
+if (lean_obj_tag(x_49) == 0)
 {
+lean_dec(x_15);
 lean_dec(x_14);
 lean_dec(x_10);
 lean_dec(x_9);
@@ -754,232 +703,72 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_1);
-return x_46;
+return x_49;
 }
 else
 {
-uint8_t x_47; 
-x_47 = !lean_is_exclusive(x_46);
-if (x_47 == 0)
-{
-lean_object* x_48; lean_object* x_49; uint8_t x_50; 
-x_48 = lean_ctor_get(x_46, 0);
-x_49 = lean_ctor_get(x_46, 1);
-x_50 = l_Lean_Exception_isRuntime(x_48);
-if (x_50 == 0)
-{
-lean_object* x_51; lean_object* x_52; 
-lean_free_object(x_46);
-lean_dec(x_48);
-x_51 = lean_unsigned_to_nat(1u);
-x_52 = lean_nat_add(x_3, x_51);
-lean_dec(x_3);
-x_2 = x_14;
-x_3 = x_52;
-x_11 = x_49;
-goto _start;
+lean_object* x_50; lean_object* x_51; 
+x_50 = lean_ctor_get(x_49, 0);
+lean_inc(x_50);
+x_51 = lean_ctor_get(x_49, 1);
+lean_inc(x_51);
+lean_dec(x_49);
+x_18 = x_50;
+x_19 = x_51;
+goto block_27;
 }
-else
-{
-lean_dec(x_14);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_1);
-return x_46;
 }
 }
 else
 {
-lean_object* x_54; lean_object* x_55; uint8_t x_56; 
-x_54 = lean_ctor_get(x_46, 0);
-x_55 = lean_ctor_get(x_46, 1);
-lean_inc(x_55);
+lean_object* x_52; lean_object* x_53; 
+lean_dec(x_30);
+x_52 = lean_ctor_get(x_32, 0);
+lean_inc(x_52);
+x_53 = lean_ctor_get(x_32, 1);
+lean_inc(x_53);
+lean_dec(x_32);
+x_18 = x_52;
+x_19 = x_53;
+goto block_27;
+}
+}
+else
+{
+lean_object* x_54; lean_object* x_55; 
+x_54 = lean_ctor_get(x_29, 0);
 lean_inc(x_54);
-lean_dec(x_46);
-x_56 = l_Lean_Exception_isRuntime(x_54);
-if (x_56 == 0)
+x_55 = lean_ctor_get(x_29, 1);
+lean_inc(x_55);
+lean_dec(x_29);
+x_18 = x_54;
+x_19 = x_55;
+goto block_27;
+}
+block_27:
 {
-lean_object* x_57; lean_object* x_58; 
-lean_dec(x_54);
-x_57 = lean_unsigned_to_nat(1u);
-x_58 = lean_nat_add(x_3, x_57);
-lean_dec(x_3);
-x_2 = x_14;
-x_3 = x_58;
-x_11 = x_55;
-goto _start;
-}
-else
+uint8_t x_20; 
+x_20 = l_Lean_Exception_isInterrupt(x_18);
+if (x_20 == 0)
 {
-lean_object* x_60; 
-lean_dec(x_14);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_1);
-x_60 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_60, 0, x_54);
-lean_ctor_set(x_60, 1, x_55);
-return x_60;
-}
-}
-}
-}
-}
-else
+uint8_t x_21; 
+x_21 = l_Lean_Exception_isRuntime(x_18);
+if (x_21 == 0)
 {
-uint8_t x_61; 
-lean_dec(x_19);
-x_61 = !lean_is_exclusive(x_21);
-if (x_61 == 0)
-{
-lean_object* x_62; lean_object* x_63; uint8_t x_64; 
-x_62 = lean_ctor_get(x_21, 0);
-x_63 = lean_ctor_get(x_21, 1);
-x_64 = l_Lean_Exception_isRuntime(x_62);
-if (x_64 == 0)
-{
-lean_object* x_65; lean_object* x_66; 
-lean_free_object(x_21);
-lean_dec(x_62);
-x_65 = lean_unsigned_to_nat(1u);
-x_66 = lean_nat_add(x_3, x_65);
-lean_dec(x_3);
-x_2 = x_14;
-x_3 = x_66;
-x_11 = x_63;
-goto _start;
-}
-else
-{
-lean_dec(x_14);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_1);
-return x_21;
-}
-}
-else
-{
-lean_object* x_68; lean_object* x_69; uint8_t x_70; 
-x_68 = lean_ctor_get(x_21, 0);
-x_69 = lean_ctor_get(x_21, 1);
-lean_inc(x_69);
-lean_inc(x_68);
-lean_dec(x_21);
-x_70 = l_Lean_Exception_isRuntime(x_68);
-if (x_70 == 0)
-{
-lean_object* x_71; lean_object* x_72; 
-lean_dec(x_68);
-x_71 = lean_unsigned_to_nat(1u);
-x_72 = lean_nat_add(x_3, x_71);
-lean_dec(x_3);
-x_2 = x_14;
-x_3 = x_72;
-x_11 = x_69;
-goto _start;
-}
-else
-{
-lean_object* x_74; 
-lean_dec(x_14);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_1);
-x_74 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_74, 0, x_68);
-lean_ctor_set(x_74, 1, x_69);
-return x_74;
-}
-}
-}
-}
-else
-{
-uint8_t x_75; 
-x_75 = !lean_is_exclusive(x_18);
-if (x_75 == 0)
-{
-lean_object* x_76; lean_object* x_77; uint8_t x_78; 
-x_76 = lean_ctor_get(x_18, 0);
-x_77 = lean_ctor_get(x_18, 1);
-x_78 = l_Lean_Exception_isRuntime(x_76);
-if (x_78 == 0)
-{
-lean_object* x_79; lean_object* x_80; 
-lean_free_object(x_18);
-lean_dec(x_76);
-x_79 = lean_unsigned_to_nat(1u);
-x_80 = lean_nat_add(x_3, x_79);
-lean_dec(x_3);
-x_2 = x_14;
-x_3 = x_80;
-x_11 = x_77;
-goto _start;
-}
-else
-{
-lean_dec(x_14);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_1);
-return x_18;
-}
-}
-else
-{
-lean_object* x_82; lean_object* x_83; uint8_t x_84; 
-x_82 = lean_ctor_get(x_18, 0);
-x_83 = lean_ctor_get(x_18, 1);
-lean_inc(x_83);
-lean_inc(x_82);
+lean_object* x_22; lean_object* x_23; 
 lean_dec(x_18);
-x_84 = l_Lean_Exception_isRuntime(x_82);
-if (x_84 == 0)
-{
-lean_object* x_85; lean_object* x_86; 
-lean_dec(x_82);
-x_85 = lean_unsigned_to_nat(1u);
-x_86 = lean_nat_add(x_3, x_85);
+lean_dec(x_15);
+x_22 = lean_unsigned_to_nat(1u);
+x_23 = lean_nat_add(x_3, x_22);
 lean_dec(x_3);
 x_2 = x_14;
-x_3 = x_86;
-x_11 = x_83;
+x_3 = x_23;
+x_11 = x_19;
 goto _start;
 }
 else
 {
-lean_object* x_88; 
+lean_object* x_25; 
 lean_dec(x_14);
 lean_dec(x_10);
 lean_dec(x_9);
@@ -990,11 +779,37 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_1);
-x_88 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_88, 0, x_82);
-lean_ctor_set(x_88, 1, x_83);
-return x_88;
+if (lean_is_scalar(x_15)) {
+ x_25 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_25 = x_15;
 }
+lean_ctor_set(x_25, 0, x_18);
+lean_ctor_set(x_25, 1, x_19);
+return x_25;
+}
+}
+else
+{
+lean_object* x_26; 
+lean_dec(x_14);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_1);
+if (lean_is_scalar(x_15)) {
+ x_26 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_26 = x_15;
+}
+lean_ctor_set(x_26, 0, x_18);
+lean_ctor_set(x_26, 1, x_19);
+return x_26;
 }
 }
 }

stage0/stdlib/Lean/Elab/Deriving/Util.c

@@ -27,6 +27,7 @@ static lean_object* l_Lean_Elab_Deriving_mkInductiveApp___closed__1;
 static lean_object* l_Lean_Elab_Deriving_mkInductiveApp___closed__2;
 lean_object* l_Lean_getConstInfo___at_Lean_Elab_Term_mkConst___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Elab_Deriving_mkContext___closed__4;
+uint8_t l_Lean_Exception_isInterrupt(lean_object*);
 static lean_object* l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_mkInstanceCmds___spec__1___lambda__1___closed__9;
 static lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Deriving_mkImplicitBinders___spec__1___closed__2;
 LEAN_EXPORT lean_object* l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_mkInstanceCmds___spec__1___boxed(lean_object**);
@@ -1063,350 +1064,292 @@ x_19 = lean_unsigned_to_nat(0u);
 x_20 = lean_nat_dec_eq(x_6, x_19);
 if (x_20 == 0)
 {
-lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_29; lean_object* x_30; 
+lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_32; lean_object* x_33; 
 x_21 = lean_unsigned_to_nat(1u);
 x_22 = lean_nat_sub(x_6, x_21);
 lean_dec(x_6);
-x_29 = lean_nat_dec_lt(x_7, x_5);
-if (x_29 == 0)
+x_32 = lean_nat_dec_lt(x_7, x_5);
+if (x_32 == 0)
 {
-lean_object* x_108; lean_object* x_109; 
-x_108 = l_Lean_instInhabitedExpr;
-x_109 = l___private_Init_GetElem_0__outOfBounds___rarg(x_108);
-x_30 = x_109;
-goto block_107;
+lean_object* x_99; lean_object* x_100; 
+x_99 = l_Lean_instInhabitedExpr;
+x_100 = l___private_Init_GetElem_0__outOfBounds___rarg(x_99);
+x_33 = x_100;
+goto block_98;
 }
 else
 {
-lean_object* x_110; 
-x_110 = lean_array_fget(x_3, x_7);
-x_30 = x_110;
-goto block_107;
+lean_object* x_101; 
+x_101 = lean_array_fget(x_3, x_7);
+x_33 = x_101;
+goto block_98;
 }
-block_28:
+block_31:
 {
-lean_object* x_25; lean_object* x_26; 
-x_25 = lean_ctor_get(x_23, 0);
-lean_inc(x_25);
+uint8_t x_25; 
+x_25 = l_Lean_Exception_isInterrupt(x_23);
+if (x_25 == 0)
+{
+uint8_t x_26; 
+x_26 = l_Lean_Exception_isRuntime(x_23);
+if (x_26 == 0)
+{
+lean_object* x_27; 
 lean_dec(x_23);
-x_26 = lean_nat_add(x_7, x_9);
+x_27 = lean_nat_add(x_7, x_9);
 lean_dec(x_7);
 x_6 = x_22;
-x_7 = x_26;
-x_10 = x_25;
+x_7 = x_27;
 x_17 = x_24;
 goto _start;
 }
-block_107:
+else
 {
-lean_object* x_31; lean_object* x_32; lean_object* x_33; 
-x_31 = l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_mkInstImplicitBinders___spec__1___closed__1;
-x_32 = lean_array_push(x_31, x_30);
+lean_object* x_29; 
+lean_dec(x_22);
+lean_dec(x_16);
+lean_dec(x_15);
+lean_dec(x_14);
+lean_dec(x_13);
+lean_dec(x_10);
+lean_dec(x_7);
+lean_dec(x_4);
+lean_dec(x_1);
+x_29 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_29, 0, x_23);
+lean_ctor_set(x_29, 1, x_24);
+return x_29;
+}
+}
+else
+{
+lean_object* x_30; 
+lean_dec(x_22);
+lean_dec(x_16);
+lean_dec(x_15);
+lean_dec(x_14);
+lean_dec(x_13);
+lean_dec(x_10);
+lean_dec(x_7);
+lean_dec(x_4);
+lean_dec(x_1);
+x_30 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_30, 0, x_23);
+lean_ctor_set(x_30, 1, x_24);
+return x_30;
+}
+}
+block_98:
+{
+lean_object* x_34; lean_object* x_35; lean_object* x_36; 
+x_34 = l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_mkInstImplicitBinders___spec__1___closed__1;
+x_35 = lean_array_push(x_34, x_33);
 lean_inc(x_16);
 lean_inc(x_15);
 lean_inc(x_14);
 lean_inc(x_13);
 lean_inc(x_1);
-x_33 = l_Lean_Meta_mkAppM(x_1, x_32, x_13, x_14, x_15, x_16, x_17);
-if (lean_obj_tag(x_33) == 0)
-{
-lean_object* x_34; lean_object* x_35; lean_object* x_36; 
-x_34 = lean_ctor_get(x_33, 0);
-lean_inc(x_34);
-x_35 = lean_ctor_get(x_33, 1);
-lean_inc(x_35);
-lean_dec(x_33);
-lean_inc(x_16);
-lean_inc(x_15);
-lean_inc(x_14);
-lean_inc(x_13);
-x_36 = l_Lean_Meta_isTypeCorrect(x_34, x_13, x_14, x_15, x_16, x_35);
+x_36 = l_Lean_Meta_mkAppM(x_1, x_35, x_13, x_14, x_15, x_16, x_17);
 if (lean_obj_tag(x_36) == 0)
 {
-lean_object* x_37; lean_object* x_38; lean_object* x_39; uint8_t x_80; 
+lean_object* x_37; lean_object* x_38; lean_object* x_39; 
 x_37 = lean_ctor_get(x_36, 0);
 lean_inc(x_37);
 x_38 = lean_ctor_get(x_36, 1);
 lean_inc(x_38);
 lean_dec(x_36);
-x_80 = lean_unbox(x_37);
-lean_dec(x_37);
-if (x_80 == 0)
+lean_inc(x_16);
+lean_inc(x_15);
+lean_inc(x_14);
+lean_inc(x_13);
+x_39 = l_Lean_Meta_isTypeCorrect(x_37, x_13, x_14, x_15, x_16, x_38);
+if (lean_obj_tag(x_39) == 0)
 {
-lean_object* x_81; 
-x_81 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_81, 0, x_10);
-x_23 = x_81;
-x_24 = x_38;
-goto block_28;
-}
-else
-{
-lean_object* x_82; uint8_t x_83; 
-x_82 = lean_array_get_size(x_2);
-x_83 = lean_nat_dec_lt(x_7, x_82);
-lean_dec(x_82);
-if (x_83 == 0)
-{
-lean_object* x_84; lean_object* x_85; 
-x_84 = l_Lean_instInhabitedName;
-x_85 = l___private_Init_GetElem_0__outOfBounds___rarg(x_84);
-x_39 = x_85;
-goto block_79;
-}
-else
-{
-lean_object* x_86; 
-x_86 = lean_array_fget(x_2, x_7);
-x_39 = x_86;
-goto block_79;
-}
-}
-block_79:
-{
-lean_object* x_40; uint8_t x_41; lean_object* x_42; lean_object* x_43; uint8_t x_44; 
-x_40 = lean_ctor_get(x_15, 5);
+lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; uint8_t x_86; 
+x_40 = lean_ctor_get(x_39, 0);
 lean_inc(x_40);
-x_41 = 0;
-x_42 = l_Lean_SourceInfo_fromRef(x_40, x_41);
-x_43 = lean_st_ref_get(x_16, x_38);
-x_44 = !lean_is_exclusive(x_43);
-if (x_44 == 0)
+x_41 = lean_ctor_get(x_39, 1);
+lean_inc(x_41);
+if (lean_is_exclusive(x_39)) {
+ lean_ctor_release(x_39, 0);
+ lean_ctor_release(x_39, 1);
+ x_42 = x_39;
+} else {
+ lean_dec_ref(x_39);
+ x_42 = lean_box(0);
+}
+x_86 = lean_unbox(x_40);
+lean_dec(x_40);
+if (x_86 == 0)
 {
-lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; 
-x_45 = lean_ctor_get(x_43, 1);
-x_46 = lean_ctor_get(x_43, 0);
-lean_dec(x_46);
-x_47 = l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_mkInstImplicitBinders___spec__1___closed__4;
-lean_inc(x_42);
-lean_ctor_set_tag(x_43, 2);
-lean_ctor_set(x_43, 1, x_47);
-lean_ctor_set(x_43, 0, x_42);
-x_48 = l_Lean_Elab_Deriving_mkInductiveApp___closed__13;
-lean_inc(x_4);
-lean_inc(x_42);
-x_49 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_49, 0, x_42);
-lean_ctor_set(x_49, 1, x_48);
-lean_ctor_set(x_49, 2, x_4);
-x_50 = lean_box(0);
-lean_inc(x_1);
-x_51 = l_Lean_mkCIdentFrom(x_50, x_1, x_41);
-x_52 = lean_mk_syntax_ident(x_39);
-lean_inc(x_42);
-x_53 = l_Lean_Syntax_node1(x_42, x_48, x_52);
-x_54 = l_Lean_Elab_Deriving_mkInductiveApp___closed__8;
-lean_inc(x_42);
-x_55 = l_Lean_Syntax_node2(x_42, x_54, x_51, x_53);
-x_56 = l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_mkInstImplicitBinders___spec__1___closed__5;
-lean_inc(x_42);
-x_57 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_57, 0, x_42);
-lean_ctor_set(x_57, 1, x_56);
-x_58 = l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_mkInstImplicitBinders___spec__1___closed__3;
-x_59 = l_Lean_Syntax_node4(x_42, x_58, x_43, x_49, x_55, x_57);
-x_60 = lean_array_push(x_10, x_59);
-x_61 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_61, 0, x_60);
-x_23 = x_61;
-x_24 = x_45;
-goto block_28;
+lean_object* x_87; 
+lean_dec(x_42);
+x_87 = lean_nat_add(x_7, x_9);
+lean_dec(x_7);
+x_6 = x_22;
+x_7 = x_87;
+x_17 = x_41;
+goto _start;
 }
 else
 {
-lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; 
-x_62 = lean_ctor_get(x_43, 1);
-lean_inc(x_62);
-lean_dec(x_43);
-x_63 = l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_mkInstImplicitBinders___spec__1___closed__4;
-lean_inc(x_42);
-x_64 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_64, 0, x_42);
-lean_ctor_set(x_64, 1, x_63);
-x_65 = l_Lean_Elab_Deriving_mkInductiveApp___closed__13;
-lean_inc(x_4);
-lean_inc(x_42);
-x_66 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_66, 0, x_42);
-lean_ctor_set(x_66, 1, x_65);
-lean_ctor_set(x_66, 2, x_4);
-x_67 = lean_box(0);
-lean_inc(x_1);
-x_68 = l_Lean_mkCIdentFrom(x_67, x_1, x_41);
-x_69 = lean_mk_syntax_ident(x_39);
-lean_inc(x_42);
-x_70 = l_Lean_Syntax_node1(x_42, x_65, x_69);
-x_71 = l_Lean_Elab_Deriving_mkInductiveApp___closed__8;
-lean_inc(x_42);
-x_72 = l_Lean_Syntax_node2(x_42, x_71, x_68, x_70);
-x_73 = l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_mkInstImplicitBinders___spec__1___closed__5;
-lean_inc(x_42);
-x_74 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_74, 0, x_42);
-lean_ctor_set(x_74, 1, x_73);
-x_75 = l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_mkInstImplicitBinders___spec__1___closed__3;
-x_76 = l_Lean_Syntax_node4(x_42, x_75, x_64, x_66, x_72, x_74);
-x_77 = lean_array_push(x_10, x_76);
-x_78 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_78, 0, x_77);
-x_23 = x_78;
-x_24 = x_62;
-goto block_28;
-}
-}
-}
-else
-{
-uint8_t x_87; 
-x_87 = !lean_is_exclusive(x_36);
-if (x_87 == 0)
-{
-lean_object* x_88; lean_object* x_89; uint8_t x_90; 
-x_88 = lean_ctor_get(x_36, 0);
-x_89 = lean_ctor_get(x_36, 1);
-x_90 = l_Lean_Exception_isRuntime(x_88);
+lean_object* x_89; uint8_t x_90; 
+x_89 = lean_array_get_size(x_2);
+x_90 = lean_nat_dec_lt(x_7, x_89);
+lean_dec(x_89);
 if (x_90 == 0)
 {
-lean_object* x_91; 
-lean_free_object(x_36);
-lean_dec(x_88);
-x_91 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_91, 0, x_10);
-x_23 = x_91;
-x_24 = x_89;
-goto block_28;
+lean_object* x_91; lean_object* x_92; 
+x_91 = l_Lean_instInhabitedName;
+x_92 = l___private_Init_GetElem_0__outOfBounds___rarg(x_91);
+x_43 = x_92;
+goto block_85;
 }
 else
 {
-lean_dec(x_22);
-lean_dec(x_16);
-lean_dec(x_15);
-lean_dec(x_14);
-lean_dec(x_13);
-lean_dec(x_10);
+lean_object* x_93; 
+x_93 = lean_array_fget(x_2, x_7);
+x_43 = x_93;
+goto block_85;
+}
+}
+block_85:
+{
+lean_object* x_44; uint8_t x_45; lean_object* x_46; lean_object* x_47; uint8_t x_48; 
+x_44 = lean_ctor_get(x_15, 5);
+lean_inc(x_44);
+x_45 = 0;
+x_46 = l_Lean_SourceInfo_fromRef(x_44, x_45);
+x_47 = lean_st_ref_get(x_16, x_41);
+x_48 = !lean_is_exclusive(x_47);
+if (x_48 == 0)
+{
+lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; 
+x_49 = lean_ctor_get(x_47, 1);
+x_50 = lean_ctor_get(x_47, 0);
+lean_dec(x_50);
+x_51 = l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_mkInstImplicitBinders___spec__1___closed__4;
+lean_inc(x_46);
+lean_ctor_set_tag(x_47, 2);
+lean_ctor_set(x_47, 1, x_51);
+lean_ctor_set(x_47, 0, x_46);
+x_52 = l_Lean_Elab_Deriving_mkInductiveApp___closed__13;
+lean_inc(x_4);
+lean_inc(x_46);
+x_53 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_53, 0, x_46);
+lean_ctor_set(x_53, 1, x_52);
+lean_ctor_set(x_53, 2, x_4);
+x_54 = lean_box(0);
+lean_inc(x_1);
+x_55 = l_Lean_mkCIdentFrom(x_54, x_1, x_45);
+x_56 = lean_mk_syntax_ident(x_43);
+lean_inc(x_46);
+x_57 = l_Lean_Syntax_node1(x_46, x_52, x_56);
+x_58 = l_Lean_Elab_Deriving_mkInductiveApp___closed__8;
+lean_inc(x_46);
+x_59 = l_Lean_Syntax_node2(x_46, x_58, x_55, x_57);
+x_60 = l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_mkInstImplicitBinders___spec__1___closed__5;
+lean_inc(x_46);
+if (lean_is_scalar(x_42)) {
+ x_61 = lean_alloc_ctor(2, 2, 0);
+} else {
+ x_61 = x_42;
+ lean_ctor_set_tag(x_61, 2);
+}
+lean_ctor_set(x_61, 0, x_46);
+lean_ctor_set(x_61, 1, x_60);
+x_62 = l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_mkInstImplicitBinders___spec__1___closed__3;
+x_63 = l_Lean_Syntax_node4(x_46, x_62, x_47, x_53, x_59, x_61);
+x_64 = lean_array_push(x_10, x_63);
+x_65 = lean_nat_add(x_7, x_9);
 lean_dec(x_7);
-lean_dec(x_4);
-lean_dec(x_1);
-return x_36;
+x_6 = x_22;
+x_7 = x_65;
+x_10 = x_64;
+x_17 = x_49;
+goto _start;
+}
+else
+{
+lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; 
+x_67 = lean_ctor_get(x_47, 1);
+lean_inc(x_67);
+lean_dec(x_47);
+x_68 = l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_mkInstImplicitBinders___spec__1___closed__4;
+lean_inc(x_46);
+x_69 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_69, 0, x_46);
+lean_ctor_set(x_69, 1, x_68);
+x_70 = l_Lean_Elab_Deriving_mkInductiveApp___closed__13;
+lean_inc(x_4);
+lean_inc(x_46);
+x_71 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_71, 0, x_46);
+lean_ctor_set(x_71, 1, x_70);
+lean_ctor_set(x_71, 2, x_4);
+x_72 = lean_box(0);
+lean_inc(x_1);
+x_73 = l_Lean_mkCIdentFrom(x_72, x_1, x_45);
+x_74 = lean_mk_syntax_ident(x_43);
+lean_inc(x_46);
+x_75 = l_Lean_Syntax_node1(x_46, x_70, x_74);
+x_76 = l_Lean_Elab_Deriving_mkInductiveApp___closed__8;
+lean_inc(x_46);
+x_77 = l_Lean_Syntax_node2(x_46, x_76, x_73, x_75);
+x_78 = l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_mkInstImplicitBinders___spec__1___closed__5;
+lean_inc(x_46);
+if (lean_is_scalar(x_42)) {
+ x_79 = lean_alloc_ctor(2, 2, 0);
+} else {
+ x_79 = x_42;
+ lean_ctor_set_tag(x_79, 2);
+}
+lean_ctor_set(x_79, 0, x_46);
+lean_ctor_set(x_79, 1, x_78);
+x_80 = l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_mkInstImplicitBinders___spec__1___closed__3;
+x_81 = l_Lean_Syntax_node4(x_46, x_80, x_69, x_71, x_77, x_79);
+x_82 = lean_array_push(x_10, x_81);
+x_83 = lean_nat_add(x_7, x_9);
+lean_dec(x_7);
+x_6 = x_22;
+x_7 = x_83;
+x_10 = x_82;
+x_17 = x_67;
+goto _start;
+}
 }
 }
 else
 {
-lean_object* x_92; lean_object* x_93; uint8_t x_94; 
-x_92 = lean_ctor_get(x_36, 0);
-x_93 = lean_ctor_get(x_36, 1);
-lean_inc(x_93);
-lean_inc(x_92);
+lean_object* x_94; lean_object* x_95; 
+x_94 = lean_ctor_get(x_39, 0);
+lean_inc(x_94);
+x_95 = lean_ctor_get(x_39, 1);
+lean_inc(x_95);
+lean_dec(x_39);
+x_23 = x_94;
+x_24 = x_95;
+goto block_31;
+}
+}
+else
+{
+lean_object* x_96; lean_object* x_97; 
+x_96 = lean_ctor_get(x_36, 0);
+lean_inc(x_96);
+x_97 = lean_ctor_get(x_36, 1);
+lean_inc(x_97);
 lean_dec(x_36);
-x_94 = l_Lean_Exception_isRuntime(x_92);
-if (x_94 == 0)
-{
-lean_object* x_95; 
-lean_dec(x_92);
-x_95 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_95, 0, x_10);
-x_23 = x_95;
-x_24 = x_93;
-goto block_28;
-}
-else
-{
-lean_object* x_96; 
-lean_dec(x_22);
-lean_dec(x_16);
-lean_dec(x_15);
-lean_dec(x_14);
-lean_dec(x_13);
-lean_dec(x_10);
-lean_dec(x_7);
-lean_dec(x_4);
-lean_dec(x_1);
-x_96 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_96, 0, x_92);
-lean_ctor_set(x_96, 1, x_93);
-return x_96;
-}
+x_23 = x_96;
+x_24 = x_97;
+goto block_31;
 }
 }
 }
 else
 {
-uint8_t x_97; 
-x_97 = !lean_is_exclusive(x_33);
-if (x_97 == 0)
-{
-lean_object* x_98; lean_object* x_99; uint8_t x_100; 
-x_98 = lean_ctor_get(x_33, 0);
-x_99 = lean_ctor_get(x_33, 1);
-x_100 = l_Lean_Exception_isRuntime(x_98);
-if (x_100 == 0)
-{
-lean_object* x_101; 
-lean_free_object(x_33);
-lean_dec(x_98);
-x_101 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_101, 0, x_10);
-x_23 = x_101;
-x_24 = x_99;
-goto block_28;
-}
-else
-{
-lean_dec(x_22);
-lean_dec(x_16);
-lean_dec(x_15);
-lean_dec(x_14);
-lean_dec(x_13);
-lean_dec(x_10);
-lean_dec(x_7);
-lean_dec(x_4);
-lean_dec(x_1);
-return x_33;
-}
-}
-else
-{
-lean_object* x_102; lean_object* x_103; uint8_t x_104; 
-x_102 = lean_ctor_get(x_33, 0);
-x_103 = lean_ctor_get(x_33, 1);
-lean_inc(x_103);
-lean_inc(x_102);
-lean_dec(x_33);
-x_104 = l_Lean_Exception_isRuntime(x_102);
-if (x_104 == 0)
-{
-lean_object* x_105; 
-lean_dec(x_102);
-x_105 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_105, 0, x_10);
-x_23 = x_105;
-x_24 = x_103;
-goto block_28;
-}
-else
-{
-lean_object* x_106; 
-lean_dec(x_22);
-lean_dec(x_16);
-lean_dec(x_15);
-lean_dec(x_14);
-lean_dec(x_13);
-lean_dec(x_10);
-lean_dec(x_7);
-lean_dec(x_4);
-lean_dec(x_1);
-x_106 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_106, 0, x_102);
-lean_ctor_set(x_106, 1, x_103);
-return x_106;
-}
-}
-}
-}
-}
-else
-{
-lean_object* x_111; 
+lean_object* x_102; 
 lean_dec(x_16);
 lean_dec(x_15);
 lean_dec(x_14);
@@ -1415,15 +1358,15 @@ lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_4);
 lean_dec(x_1);
-x_111 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_111, 0, x_10);
-lean_ctor_set(x_111, 1, x_17);
-return x_111;
+x_102 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_102, 0, x_10);
+lean_ctor_set(x_102, 1, x_17);
+return x_102;
 }
 }
 else
 {
-lean_object* x_112; 
+lean_object* x_103; 
 lean_dec(x_16);
 lean_dec(x_15);
 lean_dec(x_14);
@@ -1432,10 +1375,10 @@ lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_4);
 lean_dec(x_1);
-x_112 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_112, 0, x_10);
-lean_ctor_set(x_112, 1, x_17);
-return x_112;
+x_103 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_103, 0, x_10);
+lean_ctor_set(x_103, 1, x_17);
+return x_103;
 }
 }
 }

stage0/stdlib/Lean/Elab/ElabRules.c

@@ -474,7 +474,7 @@ return x_12;
 }
 else
 {
-lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; 
+lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; uint8_t x_22; lean_object* x_23; lean_object* x_24; 
 x_13 = lean_ctor_get(x_3, 0);
 x_14 = lean_ctor_get(x_3, 1);
 x_15 = lean_ctor_get(x_3, 2);
@@ -483,6 +483,9 @@ x_17 = lean_ctor_get(x_3, 4);
 x_18 = lean_ctor_get(x_3, 5);
 x_19 = lean_ctor_get(x_3, 7);
 x_20 = lean_ctor_get(x_3, 8);
+x_21 = lean_ctor_get(x_3, 9);
+x_22 = lean_ctor_get_uint8(x_3, sizeof(void*)*10);
+lean_inc(x_21);
 lean_inc(x_20);
 lean_inc(x_19);
 lean_inc(x_18);
@@ -492,19 +495,21 @@ lean_inc(x_15);
 lean_inc(x_14);
 lean_inc(x_13);
 lean_dec(x_3);
-x_21 = lean_alloc_ctor(0, 9, 0);
-lean_ctor_set(x_21, 0, x_13);
-lean_ctor_set(x_21, 1, x_14);
-lean_ctor_set(x_21, 2, x_15);
-lean_ctor_set(x_21, 3, x_16);
-lean_ctor_set(x_21, 4, x_17);
-lean_ctor_set(x_21, 5, x_18);
-lean_ctor_set(x_21, 6, x_9);
-lean_ctor_set(x_21, 7, x_19);
-lean_ctor_set(x_21, 8, x_20);
-x_22 = l_Lean_throwError___at_Lean_Elab_Command_elabElabRulesAux___spec__3(x_2, x_21, x_4, x_8);
+x_23 = lean_alloc_ctor(0, 10, 1);
+lean_ctor_set(x_23, 0, x_13);
+lean_ctor_set(x_23, 1, x_14);
+lean_ctor_set(x_23, 2, x_15);
+lean_ctor_set(x_23, 3, x_16);
+lean_ctor_set(x_23, 4, x_17);
+lean_ctor_set(x_23, 5, x_18);
+lean_ctor_set(x_23, 6, x_9);
+lean_ctor_set(x_23, 7, x_19);
+lean_ctor_set(x_23, 8, x_20);
+lean_ctor_set(x_23, 9, x_21);
+lean_ctor_set_uint8(x_23, sizeof(void*)*10, x_22);
+x_24 = l_Lean_throwError___at_Lean_Elab_Command_elabElabRulesAux___spec__3(x_2, x_23, x_4, x_8);
 lean_dec(x_4);
-return x_22;
+return x_24;
 }
 }
 }

stage0/stdlib/Lean/Elab/Exception.c

@@ -1,6 +1,6 @@
 // Lean compiler output
 // Module: Lean.Elab.Exception
-// Imports: Lean.InternalExceptionId Lean.Meta.Basic
+// Imports: Lean.InternalExceptionId Lean.Exception
 #include <lean/lean.h>
 #if defined(__clang__)
 #pragma clang diagnostic ignored "-Wunused-parameter"
@@ -779,7 +779,7 @@ return x_8;
 }
 }
 lean_object* initialize_Lean_InternalExceptionId(uint8_t builtin, lean_object*);
-lean_object* initialize_Lean_Meta_Basic(uint8_t builtin, lean_object*);
+lean_object* initialize_Lean_Exception(uint8_t builtin, lean_object*);
 static bool _G_initialized = false;
 LEAN_EXPORT lean_object* initialize_Lean_Elab_Exception(uint8_t builtin, lean_object* w) {
 lean_object * res;
@@ -788,7 +788,7 @@ _G_initialized = true;
 res = initialize_Lean_InternalExceptionId(builtin, lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
-res = initialize_Lean_Meta_Basic(builtin, lean_io_mk_world());
+res = initialize_Lean_Exception(builtin, lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
 l_Lean_Elab_initFn____x40_Lean_Elab_Exception___hyg_4____closed__1 = _init_l_Lean_Elab_initFn____x40_Lean_Elab_Exception___hyg_4____closed__1();

stage0/stdlib/Lean/Elab/GuardMsgs.c

@@ -29,6 +29,7 @@ lean_object* lean_mk_empty_array_with_capacity(lean_object*);
 static lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_GuardMsgs_parseGuardMsgsSpec___spec__2___lambda__8___closed__3;
 static lean_object* l_Lean_Elab_Tactic_GuardMsgs_instImpl____x40_Lean_Elab_GuardMsgs___hyg_1814____closed__3;
 LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_GuardMsgs_MessageOrdering_toCtorIdx(uint8_t);
+static lean_object* l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__8;
 LEAN_EXPORT lean_object* l_Lean_AssocList_find_x3f___at_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___spec__27___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_String_split___at_Lean_Elab_Tactic_GuardMsgs_WhitespaceMode_apply___spec__1___boxed(lean_object*);
 static lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_GuardMsgs_parseGuardMsgsSpec___spec__2___closed__3;
@@ -54,7 +55,6 @@ lean_object* l_Lean_Elab_Command_elabCommandTopLevel(lean_object*, lean_object*,
 static lean_object* l_Lean_Elab_Tactic_GuardMsgs_guardMsgsCodeAction___rarg___closed__14;
 LEAN_EXPORT lean_object* l_List_forIn_loop___at_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_GuardMsgs_parseGuardMsgsSpec___spec__2___closed__1;
-lean_object* l_Lean_PersistentArray_push___rarg(lean_object*, lean_object*);
 lean_object* lean_array_push(lean_object*, lean_object*);
 lean_object* l_Array_toSubarray___rarg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_HashMapImp_expand___at_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___spec__20___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -109,7 +109,6 @@ LEAN_EXPORT lean_object* l_Array_sequenceMap_loop___at_Lean_Elab_Tactic_GuardMsg
 static lean_object* l_Lean_Elab_Tactic_GuardMsgs_instImpl____x40_Lean_Elab_GuardMsgs___hyg_1814____closed__5;
 LEAN_EXPORT lean_object* l_List_forIn_loop___at_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___spec__44___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_HashMapImp_moveEntries___at_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___spec__37(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_PersistentArray_toList___rarg(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Tactic_GuardMsgs_parseGuardMsgsSpec___spec__3(lean_object*, lean_object*);
 lean_object* l_List_head_x21___rarg(lean_object*, lean_object*);
 uint8_t lean_string_dec_eq(lean_object*, lean_object*);
@@ -172,6 +171,7 @@ static lean_object* l_Lean_Elab_Tactic_GuardMsgs_parseGuardMsgsSpec___closed__2;
 LEAN_EXPORT lean_object* l_Lean_Diff_Histogram_addLeft___at_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___spec__9___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Elab_Tactic_GuardMsgs_guardMsgsCodeAction___rarg___closed__10;
 static lean_object* l_Lean_Elab_Tactic_GuardMsgs_revealTrailingWhitespace___closed__6;
+lean_object* l_Lean_MessageLog_toList(lean_object*);
 lean_object* l_Lean_Elab_Command_getRef(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_GuardMsgs_parseGuardMsgsSpec___lambda__1___boxed(lean_object*);
 static lean_object* l_initFn____x40_Lean_Elab_GuardMsgs___hyg_7____closed__2;
@@ -183,7 +183,6 @@ static lean_object* l___regBuiltin_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs_decl
 static lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_GuardMsgs_parseGuardMsgsSpec___spec__2___closed__10;
 LEAN_EXPORT lean_object* l_Lean_AssocList_replace___at_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___spec__17___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_MessageData_ofFormat(lean_object*);
-lean_object* l_Lean_PersistentArray_append___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_getBetterRef(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_String_splitAux___at_Lean_Elab_Tactic_GuardMsgs_WhitespaceMode_apply___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_GuardMsgs_MessageOrdering_noConfusion(lean_object*);
@@ -364,6 +363,7 @@ LEAN_EXPORT lean_object* l_Lean_mkHashMap___at_Lean_Elab_Tactic_GuardMsgs_elabGu
 LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_GuardMsgs_SpecResult_noConfusion(lean_object*);
 static lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_GuardMsgs_parseGuardMsgsSpec___spec__2___lambda__8___closed__10;
 LEAN_EXPORT lean_object* l_Lean_Loop_forIn_loop___at_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___spec__49(lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_MessageLog_append(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___spec__53(lean_object*, size_t, size_t, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_GuardMsgs_MessageOrdering_apply(uint8_t, lean_object*);
 lean_object* lean_array_uget(lean_object*, size_t);
@@ -428,6 +428,7 @@ LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1_
 lean_object* l_instDecidableEqString___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_forIn_loop___at_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___spec__44(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_GuardMsgs_revealTrailingWhitespace___boxed(lean_object*);
+lean_object* l_Lean_MessageLog_add(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_HashMap_insert___at_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___spec__18___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Subarray_split___rarg(lean_object*, lean_object*);
 static lean_object* l_Lean_Elab_Tactic_GuardMsgs_revealTrailingWhitespace___closed__1;
@@ -3970,7 +3971,7 @@ return x_15;
 }
 else
 {
-lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; uint8_t x_21; lean_object* x_22; 
+lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; uint8_t x_21; 
 x_16 = lean_unsigned_to_nat(1u);
 x_17 = l_Lean_Syntax_getArg(x_8, x_16);
 lean_dec(x_8);
@@ -3981,48 +3982,12 @@ x_20 = lean_unsigned_to_nat(0u);
 x_21 = lean_nat_dec_lt(x_20, x_19);
 if (x_21 == 0)
 {
-lean_object* x_33; 
+lean_object* x_22; lean_object* x_23; lean_object* x_24; 
 lean_dec(x_19);
 lean_dec(x_18);
-x_33 = l_Lean_Elab_Tactic_GuardMsgs_parseGuardMsgsSpec___closed__2;
-x_22 = x_33;
-goto block_32;
-}
-else
-{
-uint8_t x_34; 
-x_34 = lean_nat_dec_le(x_19, x_19);
-if (x_34 == 0)
-{
-lean_object* x_35; 
-lean_dec(x_19);
-lean_dec(x_18);
-x_35 = l_Lean_Elab_Tactic_GuardMsgs_parseGuardMsgsSpec___closed__2;
-x_22 = x_35;
-goto block_32;
-}
-else
-{
-size_t x_36; size_t x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; 
-x_36 = 0;
-x_37 = lean_usize_of_nat(x_19);
-lean_dec(x_19);
-x_38 = l_Lean_Elab_Tactic_GuardMsgs_parseGuardMsgsSpec___closed__5;
-x_39 = l_Array_foldlMUnsafe_fold___at_Lean_Syntax_SepArray_getElems___spec__1(x_18, x_36, x_37, x_38);
-lean_dec(x_18);
-x_40 = lean_ctor_get(x_39, 1);
-lean_inc(x_40);
-lean_dec(x_39);
-x_22 = x_40;
-goto block_32;
-}
-}
-block_32:
-{
-lean_object* x_23; lean_object* x_24; 
+x_22 = l_Lean_Elab_Tactic_GuardMsgs_parseGuardMsgsSpec___closed__2;
 x_23 = l_Lean_Elab_Tactic_GuardMsgs_parseGuardMsgsSpec___closed__6;
 x_24 = l_Array_sequenceMap___at_Lean_Elab_Tactic_GuardMsgs_parseGuardMsgsSpec___spec__4(x_22, x_23);
-lean_dec(x_22);
 if (lean_obj_tag(x_24) == 0)
 {
 lean_object* x_25; uint8_t x_26; 
@@ -4058,6 +4023,104 @@ x_31 = lean_apply_4(x_5, x_30, x_2, x_3, x_4);
 return x_31;
 }
 }
+else
+{
+uint8_t x_32; 
+x_32 = lean_nat_dec_le(x_19, x_19);
+if (x_32 == 0)
+{
+lean_object* x_33; lean_object* x_34; lean_object* x_35; 
+lean_dec(x_19);
+lean_dec(x_18);
+x_33 = l_Lean_Elab_Tactic_GuardMsgs_parseGuardMsgsSpec___closed__2;
+x_34 = l_Lean_Elab_Tactic_GuardMsgs_parseGuardMsgsSpec___closed__6;
+x_35 = l_Array_sequenceMap___at_Lean_Elab_Tactic_GuardMsgs_parseGuardMsgsSpec___spec__4(x_33, x_34);
+if (lean_obj_tag(x_35) == 0)
+{
+lean_object* x_36; uint8_t x_37; 
+lean_dec(x_3);
+lean_dec(x_2);
+x_36 = l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Tactic_GuardMsgs_parseGuardMsgsSpec___spec__3___rarg(x_4);
+x_37 = !lean_is_exclusive(x_36);
+if (x_37 == 0)
+{
+return x_36;
+}
+else
+{
+lean_object* x_38; lean_object* x_39; lean_object* x_40; 
+x_38 = lean_ctor_get(x_36, 0);
+x_39 = lean_ctor_get(x_36, 1);
+lean_inc(x_39);
+lean_inc(x_38);
+lean_dec(x_36);
+x_40 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_40, 0, x_38);
+lean_ctor_set(x_40, 1, x_39);
+return x_40;
+}
+}
+else
+{
+lean_object* x_41; lean_object* x_42; 
+x_41 = lean_ctor_get(x_35, 0);
+lean_inc(x_41);
+lean_dec(x_35);
+x_42 = lean_apply_4(x_5, x_41, x_2, x_3, x_4);
+return x_42;
+}
+}
+else
+{
+size_t x_43; size_t x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; 
+x_43 = 0;
+x_44 = lean_usize_of_nat(x_19);
+lean_dec(x_19);
+x_45 = l_Lean_Elab_Tactic_GuardMsgs_parseGuardMsgsSpec___closed__5;
+x_46 = l_Array_foldlMUnsafe_fold___at_Lean_Syntax_SepArray_getElems___spec__1(x_18, x_43, x_44, x_45);
+lean_dec(x_18);
+x_47 = lean_ctor_get(x_46, 1);
+lean_inc(x_47);
+lean_dec(x_46);
+x_48 = l_Lean_Elab_Tactic_GuardMsgs_parseGuardMsgsSpec___closed__6;
+x_49 = l_Array_sequenceMap___at_Lean_Elab_Tactic_GuardMsgs_parseGuardMsgsSpec___spec__4(x_47, x_48);
+lean_dec(x_47);
+if (lean_obj_tag(x_49) == 0)
+{
+lean_object* x_50; uint8_t x_51; 
+lean_dec(x_3);
+lean_dec(x_2);
+x_50 = l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Tactic_GuardMsgs_parseGuardMsgsSpec___spec__3___rarg(x_4);
+x_51 = !lean_is_exclusive(x_50);
+if (x_51 == 0)
+{
+return x_50;
+}
+else
+{
+lean_object* x_52; lean_object* x_53; lean_object* x_54; 
+x_52 = lean_ctor_get(x_50, 0);
+x_53 = lean_ctor_get(x_50, 1);
+lean_inc(x_53);
+lean_inc(x_52);
+lean_dec(x_50);
+x_54 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_54, 0, x_52);
+lean_ctor_set(x_54, 1, x_53);
+return x_54;
+}
+}
+else
+{
+lean_object* x_55; lean_object* x_56; 
+x_55 = lean_ctor_get(x_49, 0);
+lean_inc(x_55);
+lean_dec(x_49);
+x_56 = lean_apply_4(x_5, x_55, x_2, x_3, x_4);
+return x_56;
+}
+}
+}
 }
 }
 }
@@ -4569,7 +4632,7 @@ switch (x_14) {
 case 0:
 {
 lean_object* x_15; 
-x_15 = l_Lean_PersistentArray_push___rarg(x_11, x_8);
+x_15 = l_Lean_MessageLog_add(x_8, x_11);
 lean_ctor_set(x_3, 0, x_15);
 x_2 = x_9;
 goto _start;
@@ -4583,7 +4646,7 @@ goto _start;
 default: 
 {
 lean_object* x_18; 
-x_18 = l_Lean_PersistentArray_push___rarg(x_12, x_8);
+x_18 = l_Lean_MessageLog_add(x_8, x_12);
 lean_ctor_set(x_3, 1, x_18);
 x_2 = x_9;
 goto _start;
@@ -4607,7 +4670,7 @@ switch (x_23) {
 case 0:
 {
 lean_object* x_24; lean_object* x_25; 
-x_24 = l_Lean_PersistentArray_push___rarg(x_20, x_8);
+x_24 = l_Lean_MessageLog_add(x_8, x_20);
 x_25 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_25, 0, x_24);
 lean_ctor_set(x_25, 1, x_21);
@@ -4629,7 +4692,7 @@ goto _start;
 default: 
 {
 lean_object* x_29; lean_object* x_30; 
-x_29 = l_Lean_PersistentArray_push___rarg(x_21, x_8);
+x_29 = l_Lean_MessageLog_add(x_8, x_21);
 x_30 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_30, 0, x_20);
 lean_ctor_set(x_30, 1, x_29);
@@ -8494,7 +8557,7 @@ return x_12;
 }
 else
 {
-lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; 
+lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; uint8_t x_22; lean_object* x_23; lean_object* x_24; 
 x_13 = lean_ctor_get(x_3, 0);
 x_14 = lean_ctor_get(x_3, 1);
 x_15 = lean_ctor_get(x_3, 2);
@@ -8503,6 +8566,9 @@ x_17 = lean_ctor_get(x_3, 4);
 x_18 = lean_ctor_get(x_3, 5);
 x_19 = lean_ctor_get(x_3, 7);
 x_20 = lean_ctor_get(x_3, 8);
+x_21 = lean_ctor_get(x_3, 9);
+x_22 = lean_ctor_get_uint8(x_3, sizeof(void*)*10);
+lean_inc(x_21);
 lean_inc(x_20);
 lean_inc(x_19);
 lean_inc(x_18);
@@ -8512,19 +8578,21 @@ lean_inc(x_15);
 lean_inc(x_14);
 lean_inc(x_13);
 lean_dec(x_3);
-x_21 = lean_alloc_ctor(0, 9, 0);
-lean_ctor_set(x_21, 0, x_13);
-lean_ctor_set(x_21, 1, x_14);
-lean_ctor_set(x_21, 2, x_15);
-lean_ctor_set(x_21, 3, x_16);
-lean_ctor_set(x_21, 4, x_17);
-lean_ctor_set(x_21, 5, x_18);
-lean_ctor_set(x_21, 6, x_9);
-lean_ctor_set(x_21, 7, x_19);
-lean_ctor_set(x_21, 8, x_20);
-x_22 = l_Lean_throwError___at_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___spec__56(x_2, x_21, x_4, x_8);
+x_23 = lean_alloc_ctor(0, 10, 1);
+lean_ctor_set(x_23, 0, x_13);
+lean_ctor_set(x_23, 1, x_14);
+lean_ctor_set(x_23, 2, x_15);
+lean_ctor_set(x_23, 3, x_16);
+lean_ctor_set(x_23, 4, x_17);
+lean_ctor_set(x_23, 5, x_18);
+lean_ctor_set(x_23, 6, x_9);
+lean_ctor_set(x_23, 7, x_19);
+lean_ctor_set(x_23, 8, x_20);
+lean_ctor_set(x_23, 9, x_21);
+lean_ctor_set_uint8(x_23, sizeof(void*)*10, x_22);
+x_24 = l_Lean_throwError___at_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___spec__56(x_2, x_23, x_4, x_8);
 lean_dec(x_4);
-return x_22;
+return x_24;
 }
 }
 }
@@ -8663,6 +8731,18 @@ return x_5;
 static lean_object* _init_l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__4() {
 _start:
 {
+uint8_t x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = 0;
+x_2 = l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__3;
+x_3 = lean_alloc_ctor(0, 1, 1);
+lean_ctor_set(x_3, 0, x_2);
+lean_ctor_set_uint8(x_3, sizeof(void*)*1, x_1);
+return x_3;
+}
+}
+static lean_object* _init_l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__5() {
+_start:
+{
 lean_object* x_1; lean_object* x_2; 
 x_1 = l_Lean_MessageLog_empty;
 x_2 = lean_alloc_ctor(0, 2, 0);
@@ -8671,7 +8751,7 @@ lean_ctor_set(x_2, 1, x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__5() {
+static lean_object* _init_l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__6() {
 _start:
 {
 lean_object* x_1; 
@@ -8679,7 +8759,7 @@ x_1 = lean_mk_string_from_bytes("---\n", 4);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__6() {
+static lean_object* _init_l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__7() {
 _start:
 {
 lean_object* x_1; 
@@ -8687,11 +8767,11 @@ x_1 = lean_mk_string_from_bytes("❌ Docstring on `#guard_msgs` does not match g
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__7() {
+static lean_object* _init_l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__8() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__6;
+x_1 = l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__7;
 x_2 = l_Lean_stringToMessageData(x_1);
 return x_2;
 }
@@ -8914,7 +8994,7 @@ if (x_32 == 0)
 {
 lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; 
 x_33 = lean_ctor_get(x_30, 1);
-x_34 = l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__3;
+x_34 = l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__4;
 lean_ctor_set(x_30, 1, x_34);
 x_35 = lean_st_ref_set(x_5, x_30, x_31);
 x_36 = lean_ctor_get(x_35, 1);
@@ -8939,8 +9019,8 @@ x_42 = lean_ctor_get(x_40, 1);
 lean_inc(x_42);
 lean_dec(x_40);
 lean_inc(x_42);
-x_43 = l_Lean_PersistentArray_toList___rarg(x_42);
-x_44 = l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__4;
+x_43 = l_Lean_MessageLog_toList(x_42);
+x_44 = l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__5;
 x_45 = l_List_forIn_loop___at_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___spec__1(x_28, x_43, x_44, x_4, x_5, x_41);
 x_46 = lean_ctor_get(x_45, 0);
 lean_inc(x_46);
@@ -8952,7 +9032,7 @@ lean_inc(x_48);
 x_49 = lean_ctor_get(x_46, 1);
 lean_inc(x_49);
 lean_dec(x_46);
-x_50 = l_Lean_PersistentArray_toList___rarg(x_48);
+x_50 = l_Lean_MessageLog_toList(x_48);
 x_51 = lean_box(0);
 x_52 = l_List_mapM_loop___at_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___spec__2(x_50, x_51, x_4, x_5, x_47);
 if (lean_obj_tag(x_52) == 0)
@@ -8966,7 +9046,7 @@ lean_dec(x_52);
 x_55 = lean_unbox(x_27);
 lean_dec(x_27);
 x_56 = l_Lean_Elab_Tactic_GuardMsgs_MessageOrdering_apply(x_55, x_53);
-x_57 = l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__5;
+x_57 = l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__6;
 x_58 = l_String_intercalate(x_57, x_56);
 x_59 = l_String_trim(x_58);
 lean_dec(x_58);
@@ -8994,7 +9074,7 @@ if (x_68 == 0)
 lean_object* x_69; lean_object* x_70; lean_object* x_71; uint8_t x_72; 
 x_69 = lean_ctor_get(x_66, 1);
 lean_dec(x_69);
-x_70 = l_Lean_PersistentArray_append___rarg(x_33, x_42);
+x_70 = l_Lean_MessageLog_append(x_33, x_42);
 lean_ctor_set(x_66, 1, x_70);
 x_71 = lean_st_ref_set(x_5, x_66, x_67);
 x_72 = !lean_is_exclusive(x_71);
@@ -9029,7 +9109,7 @@ if (x_85 == 0)
 lean_object* x_86; lean_object* x_87; lean_object* x_88; uint8_t x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; uint8_t x_93; 
 lean_dec(x_23);
 x_86 = l_Lean_stringToMessageData(x_59);
-x_87 = l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__7;
+x_87 = l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__8;
 lean_ctor_set_tag(x_75, 6);
 lean_ctor_set(x_75, 1, x_86);
 lean_ctor_set(x_75, 0, x_87);
@@ -9103,7 +9183,7 @@ x_114 = l_Lean_Diff_linesToString___at_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs_
 lean_dec(x_113);
 x_115 = l_Lean_stringToMessageData(x_114);
 lean_dec(x_114);
-x_116 = l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__7;
+x_116 = l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__8;
 lean_ctor_set_tag(x_75, 6);
 lean_ctor_set(x_75, 1, x_115);
 lean_ctor_set(x_75, 0, x_116);
@@ -9184,7 +9264,7 @@ if (x_141 == 0)
 lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; uint8_t x_146; lean_object* x_147; lean_object* x_148; lean_object* x_149; lean_object* x_150; lean_object* x_151; lean_object* x_152; lean_object* x_153; lean_object* x_154; lean_object* x_155; lean_object* x_156; 
 lean_dec(x_23);
 x_142 = l_Lean_stringToMessageData(x_59);
-x_143 = l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__7;
+x_143 = l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__8;
 x_144 = lean_alloc_ctor(6, 2, 0);
 lean_ctor_set(x_144, 0, x_143);
 lean_ctor_set(x_144, 1, x_142);
@@ -9249,7 +9329,7 @@ x_167 = l_Lean_Diff_linesToString___at_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs_
 lean_dec(x_166);
 x_168 = l_Lean_stringToMessageData(x_167);
 lean_dec(x_167);
-x_169 = l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__7;
+x_169 = l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__8;
 x_170 = lean_alloc_ctor(6, 2, 0);
 lean_ctor_set(x_170, 0, x_169);
 lean_ctor_set(x_170, 1, x_168);
@@ -9333,7 +9413,7 @@ if (x_194 == 0)
 lean_object* x_195; lean_object* x_196; lean_object* x_197; lean_object* x_198; lean_object* x_199; uint8_t x_200; lean_object* x_201; lean_object* x_202; lean_object* x_203; lean_object* x_204; lean_object* x_205; lean_object* x_206; lean_object* x_207; lean_object* x_208; lean_object* x_209; lean_object* x_210; 
 lean_dec(x_23);
 x_195 = l_Lean_stringToMessageData(x_59);
-x_196 = l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__7;
+x_196 = l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__8;
 if (lean_is_scalar(x_187)) {
  x_197 = lean_alloc_ctor(6, 2, 0);
 } else {
@@ -9403,7 +9483,7 @@ x_221 = l_Lean_Diff_linesToString___at_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs_
 lean_dec(x_220);
 x_222 = l_Lean_stringToMessageData(x_221);
 lean_dec(x_221);
-x_223 = l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__7;
+x_223 = l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__8;
 if (lean_is_scalar(x_187)) {
  x_224 = lean_alloc_ctor(6, 2, 0);
 } else {
@@ -9473,7 +9553,7 @@ lean_inc(x_240);
 lean_inc(x_239);
 lean_inc(x_238);
 lean_dec(x_66);
-x_245 = l_Lean_PersistentArray_append___rarg(x_33, x_42);
+x_245 = l_Lean_MessageLog_append(x_33, x_42);
 x_246 = lean_alloc_ctor(0, 8, 0);
 lean_ctor_set(x_246, 0, x_238);
 lean_ctor_set(x_246, 1, x_245);
@@ -9525,7 +9605,7 @@ if (x_260 == 0)
 lean_object* x_261; lean_object* x_262; lean_object* x_263; lean_object* x_264; lean_object* x_265; uint8_t x_266; lean_object* x_267; lean_object* x_268; lean_object* x_269; lean_object* x_270; lean_object* x_271; lean_object* x_272; lean_object* x_273; lean_object* x_274; lean_object* x_275; lean_object* x_276; 
 lean_dec(x_23);
 x_261 = l_Lean_stringToMessageData(x_59);
-x_262 = l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__7;
+x_262 = l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__8;
 if (lean_is_scalar(x_253)) {
  x_263 = lean_alloc_ctor(6, 2, 0);
 } else {
@@ -9600,7 +9680,7 @@ x_287 = l_Lean_Diff_linesToString___at_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs_
 lean_dec(x_286);
 x_288 = l_Lean_stringToMessageData(x_287);
 lean_dec(x_287);
-x_289 = l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__7;
+x_289 = l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__8;
 if (lean_is_scalar(x_253)) {
  x_290 = lean_alloc_ctor(6, 2, 0);
 } else {
@@ -9678,7 +9758,7 @@ if (x_307 == 0)
 lean_object* x_308; lean_object* x_309; lean_object* x_310; uint8_t x_311; 
 x_308 = lean_ctor_get(x_305, 1);
 lean_dec(x_308);
-x_309 = l_Lean_PersistentArray_append___rarg(x_33, x_49);
+x_309 = l_Lean_MessageLog_append(x_33, x_49);
 lean_ctor_set(x_305, 1, x_309);
 x_310 = lean_st_ref_set(x_5, x_305, x_306);
 lean_dec(x_5);
@@ -9723,7 +9803,7 @@ lean_inc(x_319);
 lean_inc(x_318);
 lean_inc(x_317);
 lean_dec(x_305);
-x_324 = l_Lean_PersistentArray_append___rarg(x_33, x_49);
+x_324 = l_Lean_MessageLog_append(x_33, x_49);
 x_325 = lean_alloc_ctor(0, 8, 0);
 lean_ctor_set(x_325, 0, x_317);
 lean_ctor_set(x_325, 1, x_324);
@@ -9842,7 +9922,7 @@ lean_inc(x_341);
 lean_inc(x_340);
 lean_inc(x_339);
 lean_dec(x_30);
-x_347 = l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__3;
+x_347 = l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__4;
 x_348 = lean_alloc_ctor(0, 8, 0);
 lean_ctor_set(x_348, 0, x_339);
 lean_ctor_set(x_348, 1, x_347);
@@ -9875,8 +9955,8 @@ x_356 = lean_ctor_get(x_354, 1);
 lean_inc(x_356);
 lean_dec(x_354);
 lean_inc(x_356);
-x_357 = l_Lean_PersistentArray_toList___rarg(x_356);
-x_358 = l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__4;
+x_357 = l_Lean_MessageLog_toList(x_356);
+x_358 = l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__5;
 x_359 = l_List_forIn_loop___at_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___spec__1(x_28, x_357, x_358, x_4, x_5, x_355);
 x_360 = lean_ctor_get(x_359, 0);
 lean_inc(x_360);
@@ -9888,7 +9968,7 @@ lean_inc(x_362);
 x_363 = lean_ctor_get(x_360, 1);
 lean_inc(x_363);
 lean_dec(x_360);
-x_364 = l_Lean_PersistentArray_toList___rarg(x_362);
+x_364 = l_Lean_MessageLog_toList(x_362);
 x_365 = lean_box(0);
 x_366 = l_List_mapM_loop___at_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___spec__2(x_364, x_365, x_4, x_5, x_361);
 if (lean_obj_tag(x_366) == 0)
@@ -9902,7 +9982,7 @@ lean_dec(x_366);
 x_369 = lean_unbox(x_27);
 lean_dec(x_27);
 x_370 = l_Lean_Elab_Tactic_GuardMsgs_MessageOrdering_apply(x_369, x_367);
-x_371 = l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__5;
+x_371 = l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__6;
 x_372 = l_String_intercalate(x_371, x_370);
 x_373 = l_String_trim(x_372);
 lean_dec(x_372);
@@ -9952,7 +10032,7 @@ if (lean_is_exclusive(x_380)) {
  lean_dec_ref(x_380);
  x_389 = lean_box(0);
 }
-x_390 = l_Lean_PersistentArray_append___rarg(x_340, x_356);
+x_390 = l_Lean_MessageLog_append(x_340, x_356);
 if (lean_is_scalar(x_389)) {
  x_391 = lean_alloc_ctor(0, 8, 0);
 } else {
@@ -10008,7 +10088,7 @@ if (x_405 == 0)
 lean_object* x_406; lean_object* x_407; lean_object* x_408; lean_object* x_409; lean_object* x_410; uint8_t x_411; lean_object* x_412; lean_object* x_413; lean_object* x_414; lean_object* x_415; lean_object* x_416; lean_object* x_417; lean_object* x_418; lean_object* x_419; lean_object* x_420; lean_object* x_421; 
 lean_dec(x_23);
 x_406 = l_Lean_stringToMessageData(x_373);
-x_407 = l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__7;
+x_407 = l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__8;
 if (lean_is_scalar(x_398)) {
  x_408 = lean_alloc_ctor(6, 2, 0);
 } else {
@@ -10083,7 +10163,7 @@ x_432 = l_Lean_Diff_linesToString___at_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs_
 lean_dec(x_431);
 x_433 = l_Lean_stringToMessageData(x_432);
 lean_dec(x_432);
-x_434 = l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__7;
+x_434 = l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__8;
 if (lean_is_scalar(x_398)) {
  x_435 = lean_alloc_ctor(6, 2, 0);
 } else {
@@ -10182,7 +10262,7 @@ if (lean_is_exclusive(x_450)) {
  lean_dec_ref(x_450);
  x_459 = lean_box(0);
 }
-x_460 = l_Lean_PersistentArray_append___rarg(x_340, x_363);
+x_460 = l_Lean_MessageLog_append(x_340, x_363);
 if (lean_is_scalar(x_459)) {
  x_461 = lean_alloc_ctor(0, 8, 0);
 } else {
@@ -10333,7 +10413,7 @@ if (lean_is_exclusive(x_478)) {
  lean_dec_ref(x_478);
  x_488 = lean_box(0);
 }
-x_489 = l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__3;
+x_489 = l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__4;
 if (lean_is_scalar(x_488)) {
  x_490 = lean_alloc_ctor(0, 8, 0);
 } else {
@@ -10370,8 +10450,8 @@ x_498 = lean_ctor_get(x_496, 1);
 lean_inc(x_498);
 lean_dec(x_496);
 lean_inc(x_498);
-x_499 = l_Lean_PersistentArray_toList___rarg(x_498);
-x_500 = l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__4;
+x_499 = l_Lean_MessageLog_toList(x_498);
+x_500 = l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__5;
 x_501 = l_List_forIn_loop___at_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___spec__1(x_476, x_499, x_500, x_4, x_5, x_497);
 x_502 = lean_ctor_get(x_501, 0);
 lean_inc(x_502);
@@ -10383,7 +10463,7 @@ lean_inc(x_504);
 x_505 = lean_ctor_get(x_502, 1);
 lean_inc(x_505);
 lean_dec(x_502);
-x_506 = l_Lean_PersistentArray_toList___rarg(x_504);
+x_506 = l_Lean_MessageLog_toList(x_504);
 x_507 = lean_box(0);
 x_508 = l_List_mapM_loop___at_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___spec__2(x_506, x_507, x_4, x_5, x_503);
 if (lean_obj_tag(x_508) == 0)
@@ -10397,7 +10477,7 @@ lean_dec(x_508);
 x_511 = lean_unbox(x_475);
 lean_dec(x_475);
 x_512 = l_Lean_Elab_Tactic_GuardMsgs_MessageOrdering_apply(x_511, x_509);
-x_513 = l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__5;
+x_513 = l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__6;
 x_514 = l_String_intercalate(x_513, x_512);
 x_515 = l_String_trim(x_514);
 lean_dec(x_514);
@@ -10447,7 +10527,7 @@ if (lean_is_exclusive(x_522)) {
  lean_dec_ref(x_522);
  x_531 = lean_box(0);
 }
-x_532 = l_Lean_PersistentArray_append___rarg(x_481, x_498);
+x_532 = l_Lean_MessageLog_append(x_481, x_498);
 if (lean_is_scalar(x_531)) {
  x_533 = lean_alloc_ctor(0, 8, 0);
 } else {
@@ -10503,7 +10583,7 @@ if (x_547 == 0)
 lean_object* x_548; lean_object* x_549; lean_object* x_550; lean_object* x_551; lean_object* x_552; uint8_t x_553; lean_object* x_554; lean_object* x_555; lean_object* x_556; lean_object* x_557; lean_object* x_558; lean_object* x_559; lean_object* x_560; lean_object* x_561; lean_object* x_562; lean_object* x_563; lean_object* x_564; 
 lean_dec(x_23);
 x_548 = l_Lean_stringToMessageData(x_515);
-x_549 = l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__7;
+x_549 = l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__8;
 if (lean_is_scalar(x_540)) {
  x_550 = lean_alloc_ctor(6, 2, 0);
 } else {
@@ -10579,7 +10659,7 @@ x_575 = l_Lean_Diff_linesToString___at_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs_
 lean_dec(x_574);
 x_576 = l_Lean_stringToMessageData(x_575);
 lean_dec(x_575);
-x_577 = l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__7;
+x_577 = l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__8;
 if (lean_is_scalar(x_540)) {
  x_578 = lean_alloc_ctor(6, 2, 0);
 } else {
@@ -10678,7 +10758,7 @@ if (lean_is_exclusive(x_594)) {
  lean_dec_ref(x_594);
  x_603 = lean_box(0);
 }
-x_604 = l_Lean_PersistentArray_append___rarg(x_481, x_505);
+x_604 = l_Lean_MessageLog_append(x_481, x_505);
 if (lean_is_scalar(x_603)) {
  x_605 = lean_alloc_ctor(0, 8, 0);
 } else {
@@ -14838,6 +14918,8 @@ l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__6 = _init_l_Lea
 lean_mark_persistent(l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__6);
 l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__7 = _init_l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__7();
 lean_mark_persistent(l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__7);
+l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__8 = _init_l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__8();
+lean_mark_persistent(l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___lambda__1___closed__8);
 l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___closed__1 = _init_l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___closed__1();
 lean_mark_persistent(l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___closed__1);
 l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___closed__2 = _init_l_Lean_Elab_Tactic_GuardMsgs_elabGuardMsgs___closed__2();

stage0/stdlib/Lean/Elab/Import.c

@@ -19,7 +19,6 @@ LEAN_EXPORT lean_object* l_Lean_Elab_headerToImports___boxed(lean_object*);
 lean_object* l_Lean_FileMap_toPosition(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_processHeader___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_getId(lean_object*);
-lean_object* l_Lean_PersistentArray_push___rarg(lean_object*, lean_object*);
 lean_object* lean_array_push(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* lean_print_imports(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_getArgs(lean_object*);
@@ -58,6 +57,7 @@ uint8_t lean_usize_dec_lt(size_t, size_t);
 lean_object* lean_mk_empty_environment(uint32_t, lean_object*);
 lean_object* lean_import_modules(lean_object*, lean_object*, uint32_t, uint8_t, lean_object*);
 lean_object* lean_array_uset(lean_object*, size_t, lean_object*);
+lean_object* l_Lean_MessageLog_add(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_headerToImports___spec__1(size_t x_1, size_t x_2, lean_object* x_3) {
 _start:
 {
@@ -314,7 +314,7 @@ lean_ctor_set(x_35, 3, x_34);
 lean_ctor_set(x_35, 4, x_30);
 lean_ctor_set_uint8(x_35, sizeof(void*)*5, x_23);
 lean_ctor_set_uint8(x_35, sizeof(void*)*5 + 1, x_33);
-x_36 = l_Lean_PersistentArray_push___rarg(x_3, x_35);
+x_36 = l_Lean_MessageLog_add(x_35, x_3);
 x_37 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_37, 0, x_22);
 lean_ctor_set(x_37, 1, x_36);
@@ -339,7 +339,7 @@ lean_ctor_set(x_42, 3, x_41);
 lean_ctor_set(x_42, 4, x_30);
 lean_ctor_set_uint8(x_42, sizeof(void*)*5, x_23);
 lean_ctor_set_uint8(x_42, sizeof(void*)*5 + 1, x_40);
-x_43 = l_Lean_PersistentArray_push___rarg(x_3, x_42);
+x_43 = l_Lean_MessageLog_add(x_42, x_3);
 x_44 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_44, 0, x_22);
 lean_ctor_set(x_44, 1, x_43);
@@ -382,7 +382,7 @@ lean_ctor_set(x_59, 3, x_58);
 lean_ctor_set(x_59, 4, x_54);
 lean_ctor_set_uint8(x_59, sizeof(void*)*5, x_47);
 lean_ctor_set_uint8(x_59, sizeof(void*)*5 + 1, x_57);
-x_60 = l_Lean_PersistentArray_push___rarg(x_3, x_59);
+x_60 = l_Lean_MessageLog_add(x_59, x_3);
 x_61 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_61, 0, x_45);
 lean_ctor_set(x_61, 1, x_60);
@@ -409,7 +409,7 @@ lean_ctor_set(x_67, 3, x_66);
 lean_ctor_set(x_67, 4, x_54);
 lean_ctor_set_uint8(x_67, sizeof(void*)*5, x_47);
 lean_ctor_set_uint8(x_67, sizeof(void*)*5 + 1, x_65);
-x_68 = l_Lean_PersistentArray_push___rarg(x_3, x_67);
+x_68 = l_Lean_MessageLog_add(x_67, x_3);
 x_69 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_69, 0, x_45);
 lean_ctor_set(x_69, 1, x_68);

stage0/stdlib/Lean/Elab/LetRec.c

@@ -43,6 +43,7 @@ extern lean_object* l_Lean_maxRecDepthErrorMessage;
 lean_object* l_Lean_indentD(lean_object*);
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_Elab_Term_elabLetRec(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_WF_elabTerminationHints___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__7___lambda__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+uint8_t l_Lean_Exception_isInterrupt(lean_object*);
 lean_object* l_Lean_Syntax_formatStxAux(lean_object*, uint8_t, lean_object*, lean_object*);
 lean_object* l_Lean_FileMap_toPosition(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwError___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__9___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -421,7 +422,7 @@ return x_13;
 }
 else
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; 
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; lean_object* x_26; uint8_t x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; 
 x_14 = lean_ctor_get(x_7, 0);
 x_15 = lean_ctor_get(x_7, 1);
 x_16 = lean_ctor_get(x_7, 2);
@@ -433,7 +434,10 @@ x_21 = lean_ctor_get(x_7, 7);
 x_22 = lean_ctor_get(x_7, 8);
 x_23 = lean_ctor_get(x_7, 9);
 x_24 = lean_ctor_get(x_7, 10);
-x_25 = lean_ctor_get_uint8(x_7, sizeof(void*)*11);
+x_25 = lean_ctor_get_uint8(x_7, sizeof(void*)*12);
+x_26 = lean_ctor_get(x_7, 11);
+x_27 = lean_ctor_get_uint8(x_7, sizeof(void*)*12 + 1);
+lean_inc(x_26);
 lean_inc(x_24);
 lean_inc(x_23);
 lean_inc(x_22);
@@ -446,29 +450,31 @@ lean_inc(x_16);
 lean_inc(x_15);
 lean_inc(x_14);
 lean_dec(x_7);
-x_26 = l_Lean_replaceRef(x_1, x_19);
+x_28 = l_Lean_replaceRef(x_1, x_19);
 lean_dec(x_19);
 lean_dec(x_1);
-x_27 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_27, 0, x_14);
-lean_ctor_set(x_27, 1, x_15);
-lean_ctor_set(x_27, 2, x_16);
-lean_ctor_set(x_27, 3, x_17);
-lean_ctor_set(x_27, 4, x_18);
-lean_ctor_set(x_27, 5, x_26);
-lean_ctor_set(x_27, 6, x_20);
-lean_ctor_set(x_27, 7, x_21);
-lean_ctor_set(x_27, 8, x_22);
-lean_ctor_set(x_27, 9, x_23);
-lean_ctor_set(x_27, 10, x_24);
-lean_ctor_set_uint8(x_27, sizeof(void*)*11, x_25);
-x_28 = l_Lean_throwError___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__3(x_2, x_3, x_4, x_5, x_6, x_27, x_8, x_9);
+x_29 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_29, 0, x_14);
+lean_ctor_set(x_29, 1, x_15);
+lean_ctor_set(x_29, 2, x_16);
+lean_ctor_set(x_29, 3, x_17);
+lean_ctor_set(x_29, 4, x_18);
+lean_ctor_set(x_29, 5, x_28);
+lean_ctor_set(x_29, 6, x_20);
+lean_ctor_set(x_29, 7, x_21);
+lean_ctor_set(x_29, 8, x_22);
+lean_ctor_set(x_29, 9, x_23);
+lean_ctor_set(x_29, 10, x_24);
+lean_ctor_set(x_29, 11, x_26);
+lean_ctor_set_uint8(x_29, sizeof(void*)*12, x_25);
+lean_ctor_set_uint8(x_29, sizeof(void*)*12 + 1, x_27);
+x_30 = l_Lean_throwError___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__3(x_2, x_3, x_4, x_5, x_6, x_29, x_8, x_9);
 lean_dec(x_8);
-lean_dec(x_27);
+lean_dec(x_29);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-return x_28;
+return x_30;
 }
 }
 }
@@ -1421,7 +1427,7 @@ return x_13;
 }
 else
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; 
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; lean_object* x_26; uint8_t x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; 
 x_14 = lean_ctor_get(x_7, 0);
 x_15 = lean_ctor_get(x_7, 1);
 x_16 = lean_ctor_get(x_7, 2);
@@ -1433,7 +1439,10 @@ x_21 = lean_ctor_get(x_7, 7);
 x_22 = lean_ctor_get(x_7, 8);
 x_23 = lean_ctor_get(x_7, 9);
 x_24 = lean_ctor_get(x_7, 10);
-x_25 = lean_ctor_get_uint8(x_7, sizeof(void*)*11);
+x_25 = lean_ctor_get_uint8(x_7, sizeof(void*)*12);
+x_26 = lean_ctor_get(x_7, 11);
+x_27 = lean_ctor_get_uint8(x_7, sizeof(void*)*12 + 1);
+lean_inc(x_26);
 lean_inc(x_24);
 lean_inc(x_23);
 lean_inc(x_22);
@@ -1446,29 +1455,31 @@ lean_inc(x_16);
 lean_inc(x_15);
 lean_inc(x_14);
 lean_dec(x_7);
-x_26 = l_Lean_replaceRef(x_1, x_19);
+x_28 = l_Lean_replaceRef(x_1, x_19);
 lean_dec(x_19);
 lean_dec(x_1);
-x_27 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_27, 0, x_14);
-lean_ctor_set(x_27, 1, x_15);
-lean_ctor_set(x_27, 2, x_16);
-lean_ctor_set(x_27, 3, x_17);
-lean_ctor_set(x_27, 4, x_18);
-lean_ctor_set(x_27, 5, x_26);
-lean_ctor_set(x_27, 6, x_20);
-lean_ctor_set(x_27, 7, x_21);
-lean_ctor_set(x_27, 8, x_22);
-lean_ctor_set(x_27, 9, x_23);
-lean_ctor_set(x_27, 10, x_24);
-lean_ctor_set_uint8(x_27, sizeof(void*)*11, x_25);
-x_28 = l_Lean_throwError___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__9(x_2, x_3, x_4, x_5, x_6, x_27, x_8, x_9);
+x_29 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_29, 0, x_14);
+lean_ctor_set(x_29, 1, x_15);
+lean_ctor_set(x_29, 2, x_16);
+lean_ctor_set(x_29, 3, x_17);
+lean_ctor_set(x_29, 4, x_18);
+lean_ctor_set(x_29, 5, x_28);
+lean_ctor_set(x_29, 6, x_20);
+lean_ctor_set(x_29, 7, x_21);
+lean_ctor_set(x_29, 8, x_22);
+lean_ctor_set(x_29, 9, x_23);
+lean_ctor_set(x_29, 10, x_24);
+lean_ctor_set(x_29, 11, x_26);
+lean_ctor_set_uint8(x_29, sizeof(void*)*12, x_25);
+lean_ctor_set_uint8(x_29, sizeof(void*)*12 + 1, x_27);
+x_30 = l_Lean_throwError___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__9(x_2, x_3, x_4, x_5, x_6, x_29, x_8, x_9);
 lean_dec(x_8);
-lean_dec(x_27);
+lean_dec(x_29);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-return x_28;
+return x_30;
 }
 }
 }
@@ -1577,7 +1588,7 @@ return x_13;
 }
 else
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; 
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; lean_object* x_26; uint8_t x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; 
 x_14 = lean_ctor_get(x_7, 0);
 x_15 = lean_ctor_get(x_7, 1);
 x_16 = lean_ctor_get(x_7, 2);
@@ -1589,7 +1600,10 @@ x_21 = lean_ctor_get(x_7, 7);
 x_22 = lean_ctor_get(x_7, 8);
 x_23 = lean_ctor_get(x_7, 9);
 x_24 = lean_ctor_get(x_7, 10);
-x_25 = lean_ctor_get_uint8(x_7, sizeof(void*)*11);
+x_25 = lean_ctor_get_uint8(x_7, sizeof(void*)*12);
+x_26 = lean_ctor_get(x_7, 11);
+x_27 = lean_ctor_get_uint8(x_7, sizeof(void*)*12 + 1);
+lean_inc(x_26);
 lean_inc(x_24);
 lean_inc(x_23);
 lean_inc(x_22);
@@ -1602,29 +1616,31 @@ lean_inc(x_16);
 lean_inc(x_15);
 lean_inc(x_14);
 lean_dec(x_7);
-x_26 = l_Lean_replaceRef(x_1, x_19);
+x_28 = l_Lean_replaceRef(x_1, x_19);
 lean_dec(x_19);
 lean_dec(x_1);
-x_27 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_27, 0, x_14);
-lean_ctor_set(x_27, 1, x_15);
-lean_ctor_set(x_27, 2, x_16);
-lean_ctor_set(x_27, 3, x_17);
-lean_ctor_set(x_27, 4, x_18);
-lean_ctor_set(x_27, 5, x_26);
-lean_ctor_set(x_27, 6, x_20);
-lean_ctor_set(x_27, 7, x_21);
-lean_ctor_set(x_27, 8, x_22);
-lean_ctor_set(x_27, 9, x_23);
-lean_ctor_set(x_27, 10, x_24);
-lean_ctor_set_uint8(x_27, sizeof(void*)*11, x_25);
-x_28 = l_Lean_throwError___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__11(x_2, x_3, x_4, x_5, x_6, x_27, x_8, x_9);
+x_29 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_29, 0, x_14);
+lean_ctor_set(x_29, 1, x_15);
+lean_ctor_set(x_29, 2, x_16);
+lean_ctor_set(x_29, 3, x_17);
+lean_ctor_set(x_29, 4, x_18);
+lean_ctor_set(x_29, 5, x_28);
+lean_ctor_set(x_29, 6, x_20);
+lean_ctor_set(x_29, 7, x_21);
+lean_ctor_set(x_29, 8, x_22);
+lean_ctor_set(x_29, 9, x_23);
+lean_ctor_set(x_29, 10, x_24);
+lean_ctor_set(x_29, 11, x_26);
+lean_ctor_set_uint8(x_29, sizeof(void*)*12, x_25);
+lean_ctor_set_uint8(x_29, sizeof(void*)*12 + 1, x_27);
+x_30 = l_Lean_throwError___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__11(x_2, x_3, x_4, x_5, x_6, x_29, x_8, x_9);
 lean_dec(x_8);
-lean_dec(x_27);
+lean_dec(x_29);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-return x_28;
+return x_30;
 }
 }
 }
@@ -1733,7 +1749,7 @@ return x_13;
 }
 else
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; 
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; lean_object* x_26; uint8_t x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; 
 x_14 = lean_ctor_get(x_7, 0);
 x_15 = lean_ctor_get(x_7, 1);
 x_16 = lean_ctor_get(x_7, 2);
@@ -1745,7 +1761,10 @@ x_21 = lean_ctor_get(x_7, 7);
 x_22 = lean_ctor_get(x_7, 8);
 x_23 = lean_ctor_get(x_7, 9);
 x_24 = lean_ctor_get(x_7, 10);
-x_25 = lean_ctor_get_uint8(x_7, sizeof(void*)*11);
+x_25 = lean_ctor_get_uint8(x_7, sizeof(void*)*12);
+x_26 = lean_ctor_get(x_7, 11);
+x_27 = lean_ctor_get_uint8(x_7, sizeof(void*)*12 + 1);
+lean_inc(x_26);
 lean_inc(x_24);
 lean_inc(x_23);
 lean_inc(x_22);
@@ -1758,29 +1777,31 @@ lean_inc(x_16);
 lean_inc(x_15);
 lean_inc(x_14);
 lean_dec(x_7);
-x_26 = l_Lean_replaceRef(x_1, x_19);
+x_28 = l_Lean_replaceRef(x_1, x_19);
 lean_dec(x_19);
 lean_dec(x_1);
-x_27 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_27, 0, x_14);
-lean_ctor_set(x_27, 1, x_15);
-lean_ctor_set(x_27, 2, x_16);
-lean_ctor_set(x_27, 3, x_17);
-lean_ctor_set(x_27, 4, x_18);
-lean_ctor_set(x_27, 5, x_26);
-lean_ctor_set(x_27, 6, x_20);
-lean_ctor_set(x_27, 7, x_21);
-lean_ctor_set(x_27, 8, x_22);
-lean_ctor_set(x_27, 9, x_23);
-lean_ctor_set(x_27, 10, x_24);
-lean_ctor_set_uint8(x_27, sizeof(void*)*11, x_25);
-x_28 = l_Lean_throwError___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__13(x_2, x_3, x_4, x_5, x_6, x_27, x_8, x_9);
+x_29 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_29, 0, x_14);
+lean_ctor_set(x_29, 1, x_15);
+lean_ctor_set(x_29, 2, x_16);
+lean_ctor_set(x_29, 3, x_17);
+lean_ctor_set(x_29, 4, x_18);
+lean_ctor_set(x_29, 5, x_28);
+lean_ctor_set(x_29, 6, x_20);
+lean_ctor_set(x_29, 7, x_21);
+lean_ctor_set(x_29, 8, x_22);
+lean_ctor_set(x_29, 9, x_23);
+lean_ctor_set(x_29, 10, x_24);
+lean_ctor_set(x_29, 11, x_26);
+lean_ctor_set_uint8(x_29, sizeof(void*)*12, x_25);
+lean_ctor_set_uint8(x_29, sizeof(void*)*12 + 1, x_27);
+x_30 = l_Lean_throwError___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__13(x_2, x_3, x_4, x_5, x_6, x_29, x_8, x_9);
 lean_dec(x_8);
-lean_dec(x_27);
+lean_dec(x_29);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-return x_28;
+return x_30;
 }
 }
 }
@@ -3023,7 +3044,7 @@ return x_13;
 }
 else
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; 
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; lean_object* x_26; uint8_t x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; 
 x_14 = lean_ctor_get(x_7, 0);
 x_15 = lean_ctor_get(x_7, 1);
 x_16 = lean_ctor_get(x_7, 2);
@@ -3035,7 +3056,10 @@ x_21 = lean_ctor_get(x_7, 7);
 x_22 = lean_ctor_get(x_7, 8);
 x_23 = lean_ctor_get(x_7, 9);
 x_24 = lean_ctor_get(x_7, 10);
-x_25 = lean_ctor_get_uint8(x_7, sizeof(void*)*11);
+x_25 = lean_ctor_get_uint8(x_7, sizeof(void*)*12);
+x_26 = lean_ctor_get(x_7, 11);
+x_27 = lean_ctor_get_uint8(x_7, sizeof(void*)*12 + 1);
+lean_inc(x_26);
 lean_inc(x_24);
 lean_inc(x_23);
 lean_inc(x_22);
@@ -3048,29 +3072,31 @@ lean_inc(x_16);
 lean_inc(x_15);
 lean_inc(x_14);
 lean_dec(x_7);
-x_26 = l_Lean_replaceRef(x_1, x_19);
+x_28 = l_Lean_replaceRef(x_1, x_19);
 lean_dec(x_19);
 lean_dec(x_1);
-x_27 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_27, 0, x_14);
-lean_ctor_set(x_27, 1, x_15);
-lean_ctor_set(x_27, 2, x_16);
-lean_ctor_set(x_27, 3, x_17);
-lean_ctor_set(x_27, 4, x_18);
-lean_ctor_set(x_27, 5, x_26);
-lean_ctor_set(x_27, 6, x_20);
-lean_ctor_set(x_27, 7, x_21);
-lean_ctor_set(x_27, 8, x_22);
-lean_ctor_set(x_27, 9, x_23);
-lean_ctor_set(x_27, 10, x_24);
-lean_ctor_set_uint8(x_27, sizeof(void*)*11, x_25);
-x_28 = l_Lean_throwError___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__16(x_2, x_3, x_4, x_5, x_6, x_27, x_8, x_9);
+x_29 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_29, 0, x_14);
+lean_ctor_set(x_29, 1, x_15);
+lean_ctor_set(x_29, 2, x_16);
+lean_ctor_set(x_29, 3, x_17);
+lean_ctor_set(x_29, 4, x_18);
+lean_ctor_set(x_29, 5, x_28);
+lean_ctor_set(x_29, 6, x_20);
+lean_ctor_set(x_29, 7, x_21);
+lean_ctor_set(x_29, 8, x_22);
+lean_ctor_set(x_29, 9, x_23);
+lean_ctor_set(x_29, 10, x_24);
+lean_ctor_set(x_29, 11, x_26);
+lean_ctor_set_uint8(x_29, sizeof(void*)*12, x_25);
+lean_ctor_set_uint8(x_29, sizeof(void*)*12 + 1, x_27);
+x_30 = l_Lean_throwError___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__16(x_2, x_3, x_4, x_5, x_6, x_29, x_8, x_9);
 lean_dec(x_8);
-lean_dec(x_27);
+lean_dec(x_29);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-return x_28;
+return x_30;
 }
 }
 }
@@ -3179,7 +3205,7 @@ return x_13;
 }
 else
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; 
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; lean_object* x_26; uint8_t x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; 
 x_14 = lean_ctor_get(x_7, 0);
 x_15 = lean_ctor_get(x_7, 1);
 x_16 = lean_ctor_get(x_7, 2);
@@ -3191,7 +3217,10 @@ x_21 = lean_ctor_get(x_7, 7);
 x_22 = lean_ctor_get(x_7, 8);
 x_23 = lean_ctor_get(x_7, 9);
 x_24 = lean_ctor_get(x_7, 10);
-x_25 = lean_ctor_get_uint8(x_7, sizeof(void*)*11);
+x_25 = lean_ctor_get_uint8(x_7, sizeof(void*)*12);
+x_26 = lean_ctor_get(x_7, 11);
+x_27 = lean_ctor_get_uint8(x_7, sizeof(void*)*12 + 1);
+lean_inc(x_26);
 lean_inc(x_24);
 lean_inc(x_23);
 lean_inc(x_22);
@@ -3204,29 +3233,31 @@ lean_inc(x_16);
 lean_inc(x_15);
 lean_inc(x_14);
 lean_dec(x_7);
-x_26 = l_Lean_replaceRef(x_1, x_19);
+x_28 = l_Lean_replaceRef(x_1, x_19);
 lean_dec(x_19);
 lean_dec(x_1);
-x_27 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_27, 0, x_14);
-lean_ctor_set(x_27, 1, x_15);
-lean_ctor_set(x_27, 2, x_16);
-lean_ctor_set(x_27, 3, x_17);
-lean_ctor_set(x_27, 4, x_18);
-lean_ctor_set(x_27, 5, x_26);
-lean_ctor_set(x_27, 6, x_20);
-lean_ctor_set(x_27, 7, x_21);
-lean_ctor_set(x_27, 8, x_22);
-lean_ctor_set(x_27, 9, x_23);
-lean_ctor_set(x_27, 10, x_24);
-lean_ctor_set_uint8(x_27, sizeof(void*)*11, x_25);
-x_28 = l_Lean_throwError___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__22(x_2, x_3, x_4, x_5, x_6, x_27, x_8, x_9);
+x_29 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_29, 0, x_14);
+lean_ctor_set(x_29, 1, x_15);
+lean_ctor_set(x_29, 2, x_16);
+lean_ctor_set(x_29, 3, x_17);
+lean_ctor_set(x_29, 4, x_18);
+lean_ctor_set(x_29, 5, x_28);
+lean_ctor_set(x_29, 6, x_20);
+lean_ctor_set(x_29, 7, x_21);
+lean_ctor_set(x_29, 8, x_22);
+lean_ctor_set(x_29, 9, x_23);
+lean_ctor_set(x_29, 10, x_24);
+lean_ctor_set(x_29, 11, x_26);
+lean_ctor_set_uint8(x_29, sizeof(void*)*12, x_25);
+lean_ctor_set_uint8(x_29, sizeof(void*)*12 + 1, x_27);
+x_30 = l_Lean_throwError___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__22(x_2, x_3, x_4, x_5, x_6, x_29, x_8, x_9);
 lean_dec(x_8);
-lean_dec(x_27);
+lean_dec(x_29);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-return x_28;
+return x_30;
 }
 }
 }
@@ -3996,7 +4027,7 @@ return x_13;
 }
 else
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; 
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; lean_object* x_26; uint8_t x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; 
 x_14 = lean_ctor_get(x_7, 0);
 x_15 = lean_ctor_get(x_7, 1);
 x_16 = lean_ctor_get(x_7, 2);
@@ -4008,7 +4039,10 @@ x_21 = lean_ctor_get(x_7, 7);
 x_22 = lean_ctor_get(x_7, 8);
 x_23 = lean_ctor_get(x_7, 9);
 x_24 = lean_ctor_get(x_7, 10);
-x_25 = lean_ctor_get_uint8(x_7, sizeof(void*)*11);
+x_25 = lean_ctor_get_uint8(x_7, sizeof(void*)*12);
+x_26 = lean_ctor_get(x_7, 11);
+x_27 = lean_ctor_get_uint8(x_7, sizeof(void*)*12 + 1);
+lean_inc(x_26);
 lean_inc(x_24);
 lean_inc(x_23);
 lean_inc(x_22);
@@ -4021,24 +4055,26 @@ lean_inc(x_16);
 lean_inc(x_15);
 lean_inc(x_14);
 lean_dec(x_7);
-x_26 = l_Lean_replaceRef(x_1, x_19);
+x_28 = l_Lean_replaceRef(x_1, x_19);
 lean_dec(x_19);
-x_27 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_27, 0, x_14);
-lean_ctor_set(x_27, 1, x_15);
-lean_ctor_set(x_27, 2, x_16);
-lean_ctor_set(x_27, 3, x_17);
-lean_ctor_set(x_27, 4, x_18);
-lean_ctor_set(x_27, 5, x_26);
-lean_ctor_set(x_27, 6, x_20);
-lean_ctor_set(x_27, 7, x_21);
-lean_ctor_set(x_27, 8, x_22);
-lean_ctor_set(x_27, 9, x_23);
-lean_ctor_set(x_27, 10, x_24);
-lean_ctor_set_uint8(x_27, sizeof(void*)*11, x_25);
-x_28 = l_Lean_throwError___at_Lean_Elab_Term_mkAuxName___spec__1(x_2, x_3, x_4, x_5, x_6, x_27, x_8, x_9);
-lean_dec(x_27);
-return x_28;
+x_29 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_29, 0, x_14);
+lean_ctor_set(x_29, 1, x_15);
+lean_ctor_set(x_29, 2, x_16);
+lean_ctor_set(x_29, 3, x_17);
+lean_ctor_set(x_29, 4, x_18);
+lean_ctor_set(x_29, 5, x_28);
+lean_ctor_set(x_29, 6, x_20);
+lean_ctor_set(x_29, 7, x_21);
+lean_ctor_set(x_29, 8, x_22);
+lean_ctor_set(x_29, 9, x_23);
+lean_ctor_set(x_29, 10, x_24);
+lean_ctor_set(x_29, 11, x_26);
+lean_ctor_set_uint8(x_29, sizeof(void*)*12, x_25);
+lean_ctor_set_uint8(x_29, sizeof(void*)*12 + 1, x_27);
+x_30 = l_Lean_throwError___at_Lean_Elab_Term_mkAuxName___spec__1(x_2, x_3, x_4, x_5, x_6, x_29, x_8, x_9);
+lean_dec(x_29);
+return x_30;
 }
 }
 }
@@ -4479,7 +4515,7 @@ return x_13;
 }
 else
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; uint8_t x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; 
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; uint8_t x_26; lean_object* x_27; uint8_t x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; 
 x_14 = lean_array_uget(x_1, x_3);
 x_15 = lean_ctor_get(x_9, 0);
 lean_inc(x_15);
@@ -4503,80 +4539,89 @@ x_24 = lean_ctor_get(x_9, 9);
 lean_inc(x_24);
 x_25 = lean_ctor_get(x_9, 10);
 lean_inc(x_25);
-x_26 = lean_ctor_get_uint8(x_9, sizeof(void*)*11);
-x_27 = l_Lean_replaceRef(x_14, x_20);
+x_26 = lean_ctor_get_uint8(x_9, sizeof(void*)*12);
+x_27 = lean_ctor_get(x_9, 11);
+lean_inc(x_27);
+x_28 = lean_ctor_get_uint8(x_9, sizeof(void*)*12 + 1);
+x_29 = l_Lean_replaceRef(x_14, x_20);
 lean_dec(x_20);
-x_28 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_28, 0, x_15);
-lean_ctor_set(x_28, 1, x_16);
-lean_ctor_set(x_28, 2, x_17);
-lean_ctor_set(x_28, 3, x_18);
-lean_ctor_set(x_28, 4, x_19);
-lean_ctor_set(x_28, 5, x_27);
-lean_ctor_set(x_28, 6, x_21);
-lean_ctor_set(x_28, 7, x_22);
-lean_ctor_set(x_28, 8, x_23);
-lean_ctor_set(x_28, 9, x_24);
-lean_ctor_set(x_28, 10, x_25);
-lean_ctor_set_uint8(x_28, sizeof(void*)*11, x_26);
+x_30 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_30, 0, x_15);
+lean_ctor_set(x_30, 1, x_16);
+lean_ctor_set(x_30, 2, x_17);
+lean_ctor_set(x_30, 3, x_18);
+lean_ctor_set(x_30, 4, x_19);
+lean_ctor_set(x_30, 5, x_29);
+lean_ctor_set(x_30, 6, x_21);
+lean_ctor_set(x_30, 7, x_22);
+lean_ctor_set(x_30, 8, x_23);
+lean_ctor_set(x_30, 9, x_24);
+lean_ctor_set(x_30, 10, x_25);
+lean_ctor_set(x_30, 11, x_27);
+lean_ctor_set_uint8(x_30, sizeof(void*)*12, x_26);
+lean_ctor_set_uint8(x_30, sizeof(void*)*12 + 1, x_28);
 lean_inc(x_10);
 lean_inc(x_8);
 lean_inc(x_7);
 lean_inc(x_6);
 lean_inc(x_5);
-x_29 = l_Lean_Elab_elabAttr___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__19(x_14, x_5, x_6, x_7, x_8, x_28, x_10, x_11);
-if (lean_obj_tag(x_29) == 0)
+x_31 = l_Lean_Elab_elabAttr___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__19(x_14, x_5, x_6, x_7, x_8, x_30, x_10, x_11);
+if (lean_obj_tag(x_31) == 0)
 {
-lean_object* x_30; lean_object* x_31; lean_object* x_32; size_t x_33; size_t x_34; 
-x_30 = lean_ctor_get(x_29, 0);
-lean_inc(x_30);
-x_31 = lean_ctor_get(x_29, 1);
-lean_inc(x_31);
-lean_dec(x_29);
-x_32 = lean_array_push(x_4, x_30);
-x_33 = 1;
-x_34 = lean_usize_add(x_3, x_33);
-x_3 = x_34;
-x_4 = x_32;
-x_11 = x_31;
+lean_object* x_32; lean_object* x_33; lean_object* x_34; size_t x_35; size_t x_36; 
+x_32 = lean_ctor_get(x_31, 0);
+lean_inc(x_32);
+x_33 = lean_ctor_get(x_31, 1);
+lean_inc(x_33);
+lean_dec(x_31);
+x_34 = lean_array_push(x_4, x_32);
+x_35 = 1;
+x_36 = lean_usize_add(x_3, x_35);
+x_3 = x_36;
+x_4 = x_34;
+x_11 = x_33;
 goto _start;
 }
 else
 {
-uint8_t x_36; 
-x_36 = !lean_is_exclusive(x_29);
-if (x_36 == 0)
+uint8_t x_38; 
+x_38 = !lean_is_exclusive(x_31);
+if (x_38 == 0)
 {
-lean_object* x_37; lean_object* x_38; uint8_t x_39; 
-x_37 = lean_ctor_get(x_29, 0);
-x_38 = lean_ctor_get(x_29, 1);
-x_39 = l_Lean_Exception_isRuntime(x_37);
-if (x_39 == 0)
+lean_object* x_39; lean_object* x_40; uint8_t x_41; 
+x_39 = lean_ctor_get(x_31, 0);
+x_40 = lean_ctor_get(x_31, 1);
+x_41 = l_Lean_Exception_isInterrupt(x_39);
+if (x_41 == 0)
 {
-lean_object* x_40; 
-lean_free_object(x_29);
+uint8_t x_42; 
+x_42 = l_Lean_Exception_isRuntime(x_39);
+if (x_42 == 0)
+{
+lean_object* x_43; 
+lean_free_object(x_31);
 lean_inc(x_10);
 lean_inc(x_9);
 lean_inc(x_8);
 lean_inc(x_7);
 lean_inc(x_6);
 lean_inc(x_5);
-x_40 = l_Lean_Elab_logException___at_Lean_Elab_Term_exceptionToSorry___spec__1(x_37, x_5, x_6, x_7, x_8, x_9, x_10, x_38);
-if (lean_obj_tag(x_40) == 0)
+x_43 = l_Lean_Elab_logException___at_Lean_Elab_Term_exceptionToSorry___spec__1(x_39, x_5, x_6, x_7, x_8, x_9, x_10, x_40);
+if (lean_obj_tag(x_43) == 0)
 {
-lean_object* x_41; size_t x_42; size_t x_43; 
-x_41 = lean_ctor_get(x_40, 1);
-lean_inc(x_41);
-lean_dec(x_40);
-x_42 = 1;
-x_43 = lean_usize_add(x_3, x_42);
-x_3 = x_43;
-x_11 = x_41;
+lean_object* x_44; size_t x_45; size_t x_46; 
+x_44 = lean_ctor_get(x_43, 1);
+lean_inc(x_44);
+lean_dec(x_43);
+x_45 = 1;
+x_46 = lean_usize_add(x_3, x_45);
+x_3 = x_46;
+x_11 = x_44;
 goto _start;
 }
 else
 {
-uint8_t x_45; 
+uint8_t x_48; 
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
@@ -4584,72 +4629,88 @@ lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-x_45 = !lean_is_exclusive(x_40);
-if (x_45 == 0)
+x_48 = !lean_is_exclusive(x_43);
+if (x_48 == 0)
 {
-return x_40;
+return x_43;
 }
 else
 {
-lean_object* x_46; lean_object* x_47; lean_object* x_48; 
-x_46 = lean_ctor_get(x_40, 0);
-x_47 = lean_ctor_get(x_40, 1);
-lean_inc(x_47);
-lean_inc(x_46);
-lean_dec(x_40);
-x_48 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_48, 0, x_46);
-lean_ctor_set(x_48, 1, x_47);
-return x_48;
-}
-}
-}
-else
-{
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-return x_29;
-}
-}
-else
-{
-lean_object* x_49; lean_object* x_50; uint8_t x_51; 
-x_49 = lean_ctor_get(x_29, 0);
-x_50 = lean_ctor_get(x_29, 1);
+lean_object* x_49; lean_object* x_50; lean_object* x_51; 
+x_49 = lean_ctor_get(x_43, 0);
+x_50 = lean_ctor_get(x_43, 1);
 lean_inc(x_50);
 lean_inc(x_49);
-lean_dec(x_29);
-x_51 = l_Lean_Exception_isRuntime(x_49);
-if (x_51 == 0)
+lean_dec(x_43);
+x_51 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_51, 0, x_49);
+lean_ctor_set(x_51, 1, x_50);
+return x_51;
+}
+}
+}
+else
 {
-lean_object* x_52; 
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+return x_31;
+}
+}
+else
+{
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+return x_31;
+}
+}
+else
+{
+lean_object* x_52; lean_object* x_53; uint8_t x_54; 
+x_52 = lean_ctor_get(x_31, 0);
+x_53 = lean_ctor_get(x_31, 1);
+lean_inc(x_53);
+lean_inc(x_52);
+lean_dec(x_31);
+x_54 = l_Lean_Exception_isInterrupt(x_52);
+if (x_54 == 0)
+{
+uint8_t x_55; 
+x_55 = l_Lean_Exception_isRuntime(x_52);
+if (x_55 == 0)
+{
+lean_object* x_56; 
 lean_inc(x_10);
 lean_inc(x_9);
 lean_inc(x_8);
 lean_inc(x_7);
 lean_inc(x_6);
 lean_inc(x_5);
-x_52 = l_Lean_Elab_logException___at_Lean_Elab_Term_exceptionToSorry___spec__1(x_49, x_5, x_6, x_7, x_8, x_9, x_10, x_50);
-if (lean_obj_tag(x_52) == 0)
+x_56 = l_Lean_Elab_logException___at_Lean_Elab_Term_exceptionToSorry___spec__1(x_52, x_5, x_6, x_7, x_8, x_9, x_10, x_53);
+if (lean_obj_tag(x_56) == 0)
 {
-lean_object* x_53; size_t x_54; size_t x_55; 
-x_53 = lean_ctor_get(x_52, 1);
-lean_inc(x_53);
-lean_dec(x_52);
-x_54 = 1;
-x_55 = lean_usize_add(x_3, x_54);
-x_3 = x_55;
-x_11 = x_53;
+lean_object* x_57; size_t x_58; size_t x_59; 
+x_57 = lean_ctor_get(x_56, 1);
+lean_inc(x_57);
+lean_dec(x_56);
+x_58 = 1;
+x_59 = lean_usize_add(x_3, x_58);
+x_3 = x_59;
+x_11 = x_57;
 goto _start;
 }
 else
 {
-lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; 
+lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; 
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
@@ -4657,31 +4718,31 @@ lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-x_57 = lean_ctor_get(x_52, 0);
-lean_inc(x_57);
-x_58 = lean_ctor_get(x_52, 1);
-lean_inc(x_58);
-if (lean_is_exclusive(x_52)) {
- lean_ctor_release(x_52, 0);
- lean_ctor_release(x_52, 1);
- x_59 = x_52;
+x_61 = lean_ctor_get(x_56, 0);
+lean_inc(x_61);
+x_62 = lean_ctor_get(x_56, 1);
+lean_inc(x_62);
+if (lean_is_exclusive(x_56)) {
+ lean_ctor_release(x_56, 0);
+ lean_ctor_release(x_56, 1);
+ x_63 = x_56;
 } else {
- lean_dec_ref(x_52);
- x_59 = lean_box(0);
+ lean_dec_ref(x_56);
+ x_63 = lean_box(0);
 }
-if (lean_is_scalar(x_59)) {
- x_60 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_63)) {
+ x_64 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_60 = x_59;
+ x_64 = x_63;
 }
-lean_ctor_set(x_60, 0, x_57);
-lean_ctor_set(x_60, 1, x_58);
-return x_60;
+lean_ctor_set(x_64, 0, x_61);
+lean_ctor_set(x_64, 1, x_62);
+return x_64;
 }
 }
 else
 {
-lean_object* x_61; 
+lean_object* x_65; 
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
@@ -4689,10 +4750,26 @@ lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-x_61 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_61, 0, x_49);
-lean_ctor_set(x_61, 1, x_50);
-return x_61;
+x_65 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_65, 0, x_52);
+lean_ctor_set(x_65, 1, x_53);
+return x_65;
+}
+}
+else
+{
+lean_object* x_66; 
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+x_66 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_66, 0, x_52);
+lean_ctor_set(x_66, 1, x_53);
+return x_66;
 }
 }
 }
@@ -7045,7 +7122,7 @@ return x_36;
 }
 else
 {
-lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; uint8_t x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; 
+lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; uint8_t x_48; lean_object* x_49; uint8_t x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; 
 x_37 = lean_ctor_get(x_10, 0);
 x_38 = lean_ctor_get(x_10, 1);
 x_39 = lean_ctor_get(x_10, 2);
@@ -7057,7 +7134,10 @@ x_44 = lean_ctor_get(x_10, 7);
 x_45 = lean_ctor_get(x_10, 8);
 x_46 = lean_ctor_get(x_10, 9);
 x_47 = lean_ctor_get(x_10, 10);
-x_48 = lean_ctor_get_uint8(x_10, sizeof(void*)*11);
+x_48 = lean_ctor_get_uint8(x_10, sizeof(void*)*12);
+x_49 = lean_ctor_get(x_10, 11);
+x_50 = lean_ctor_get_uint8(x_10, sizeof(void*)*12 + 1);
+lean_inc(x_49);
 lean_inc(x_47);
 lean_inc(x_46);
 lean_inc(x_45);
@@ -7070,44 +7150,46 @@ lean_inc(x_39);
 lean_inc(x_38);
 lean_inc(x_37);
 lean_dec(x_10);
-x_49 = l_Lean_replaceRef(x_22, x_42);
+x_51 = l_Lean_replaceRef(x_22, x_42);
 lean_dec(x_42);
 lean_dec(x_22);
-x_50 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_50, 0, x_37);
-lean_ctor_set(x_50, 1, x_38);
-lean_ctor_set(x_50, 2, x_39);
-lean_ctor_set(x_50, 3, x_40);
-lean_ctor_set(x_50, 4, x_41);
-lean_ctor_set(x_50, 5, x_49);
-lean_ctor_set(x_50, 6, x_43);
-lean_ctor_set(x_50, 7, x_44);
-lean_ctor_set(x_50, 8, x_45);
-lean_ctor_set(x_50, 9, x_46);
-lean_ctor_set(x_50, 10, x_47);
-lean_ctor_set_uint8(x_50, sizeof(void*)*11, x_48);
-x_51 = l_Lean_throwError___at_Lean_Elab_Term_addAutoBoundImplicits_go___spec__50(x_28, x_6, x_7, x_8, x_9, x_50, x_11, x_12);
-lean_dec(x_50);
-x_52 = lean_ctor_get(x_51, 0);
-lean_inc(x_52);
-x_53 = lean_ctor_get(x_51, 1);
-lean_inc(x_53);
-if (lean_is_exclusive(x_51)) {
- lean_ctor_release(x_51, 0);
- lean_ctor_release(x_51, 1);
- x_54 = x_51;
+x_52 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_52, 0, x_37);
+lean_ctor_set(x_52, 1, x_38);
+lean_ctor_set(x_52, 2, x_39);
+lean_ctor_set(x_52, 3, x_40);
+lean_ctor_set(x_52, 4, x_41);
+lean_ctor_set(x_52, 5, x_51);
+lean_ctor_set(x_52, 6, x_43);
+lean_ctor_set(x_52, 7, x_44);
+lean_ctor_set(x_52, 8, x_45);
+lean_ctor_set(x_52, 9, x_46);
+lean_ctor_set(x_52, 10, x_47);
+lean_ctor_set(x_52, 11, x_49);
+lean_ctor_set_uint8(x_52, sizeof(void*)*12, x_48);
+lean_ctor_set_uint8(x_52, sizeof(void*)*12 + 1, x_50);
+x_53 = l_Lean_throwError___at_Lean_Elab_Term_addAutoBoundImplicits_go___spec__50(x_28, x_6, x_7, x_8, x_9, x_52, x_11, x_12);
+lean_dec(x_52);
+x_54 = lean_ctor_get(x_53, 0);
+lean_inc(x_54);
+x_55 = lean_ctor_get(x_53, 1);
+lean_inc(x_55);
+if (lean_is_exclusive(x_53)) {
+ lean_ctor_release(x_53, 0);
+ lean_ctor_release(x_53, 1);
+ x_56 = x_53;
 } else {
- lean_dec_ref(x_51);
- x_54 = lean_box(0);
+ lean_dec_ref(x_53);
+ x_56 = lean_box(0);
 }
-if (lean_is_scalar(x_54)) {
- x_55 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_56)) {
+ x_57 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_55 = x_54;
+ x_57 = x_56;
 }
-lean_ctor_set(x_55, 0, x_52);
-lean_ctor_set(x_55, 1, x_53);
-return x_55;
+lean_ctor_set(x_57, 0, x_54);
+lean_ctor_set(x_57, 1, x_55);
+return x_57;
 }
 }
 }

stage0/stdlib/Lean/Elab/Macro.c

@@ -3601,7 +3601,7 @@ return x_77;
 }
 else
 {
-lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; 
+lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; uint8_t x_87; lean_object* x_88; lean_object* x_89; 
 x_78 = lean_ctor_get(x_11, 0);
 x_79 = lean_ctor_get(x_11, 1);
 x_80 = lean_ctor_get(x_11, 2);
@@ -3610,6 +3610,9 @@ x_82 = lean_ctor_get(x_11, 4);
 x_83 = lean_ctor_get(x_11, 5);
 x_84 = lean_ctor_get(x_11, 7);
 x_85 = lean_ctor_get(x_11, 8);
+x_86 = lean_ctor_get(x_11, 9);
+x_87 = lean_ctor_get_uint8(x_11, sizeof(void*)*10);
+lean_inc(x_86);
 lean_inc(x_85);
 lean_inc(x_84);
 lean_inc(x_83);
@@ -3619,89 +3622,91 @@ lean_inc(x_80);
 lean_inc(x_79);
 lean_inc(x_78);
 lean_dec(x_11);
-x_86 = lean_alloc_ctor(0, 9, 0);
-lean_ctor_set(x_86, 0, x_78);
-lean_ctor_set(x_86, 1, x_79);
-lean_ctor_set(x_86, 2, x_80);
-lean_ctor_set(x_86, 3, x_81);
-lean_ctor_set(x_86, 4, x_82);
-lean_ctor_set(x_86, 5, x_83);
-lean_ctor_set(x_86, 6, x_36);
-lean_ctor_set(x_86, 7, x_84);
-lean_ctor_set(x_86, 8, x_85);
+x_88 = lean_alloc_ctor(0, 10, 1);
+lean_ctor_set(x_88, 0, x_78);
+lean_ctor_set(x_88, 1, x_79);
+lean_ctor_set(x_88, 2, x_80);
+lean_ctor_set(x_88, 3, x_81);
+lean_ctor_set(x_88, 4, x_82);
+lean_ctor_set(x_88, 5, x_83);
+lean_ctor_set(x_88, 6, x_36);
+lean_ctor_set(x_88, 7, x_84);
+lean_ctor_set(x_88, 8, x_85);
+lean_ctor_set(x_88, 9, x_86);
+lean_ctor_set_uint8(x_88, sizeof(void*)*10, x_87);
 lean_inc(x_12);
-lean_inc(x_86);
-x_87 = l_Lean_Elab_liftMacroM___at_Lean_Elab_Command_elabSyntax___spec__4(x_32, x_86, x_12, x_35);
-if (lean_obj_tag(x_87) == 0)
-{
-lean_object* x_88; lean_object* x_89; lean_object* x_90; size_t x_91; size_t x_92; lean_object* x_93; 
-x_88 = lean_ctor_get(x_87, 0);
 lean_inc(x_88);
-x_89 = lean_ctor_get(x_87, 1);
-lean_inc(x_89);
-lean_dec(x_87);
-x_90 = lean_array_get_size(x_25);
-x_91 = lean_usize_of_nat(x_90);
-lean_dec(x_90);
-x_92 = 0;
-lean_inc(x_12);
-lean_inc(x_86);
-x_93 = l_Array_mapMUnsafe_map___at_Lean_Elab_Command_elabMacro___spec__1(x_91, x_92, x_25, x_86, x_12, x_89);
-if (lean_obj_tag(x_93) == 0)
+x_89 = l_Lean_Elab_liftMacroM___at_Lean_Elab_Command_elabSyntax___spec__4(x_32, x_88, x_12, x_35);
+if (lean_obj_tag(x_89) == 0)
 {
-lean_object* x_94; lean_object* x_95; lean_object* x_96; 
-x_94 = lean_ctor_get(x_93, 0);
-lean_inc(x_94);
-x_95 = lean_ctor_get(x_93, 1);
-lean_inc(x_95);
-lean_dec(x_93);
-x_96 = l_Array_unzip___rarg(x_94);
-lean_dec(x_94);
+lean_object* x_90; lean_object* x_91; lean_object* x_92; size_t x_93; size_t x_94; lean_object* x_95; 
+x_90 = lean_ctor_get(x_89, 0);
+lean_inc(x_90);
+x_91 = lean_ctor_get(x_89, 1);
+lean_inc(x_91);
+lean_dec(x_89);
+x_92 = lean_array_get_size(x_25);
+x_93 = lean_usize_of_nat(x_92);
+lean_dec(x_92);
+x_94 = 0;
+lean_inc(x_12);
+lean_inc(x_88);
+x_95 = l_Array_mapMUnsafe_map___at_Lean_Elab_Command_elabMacro___spec__1(x_93, x_94, x_25, x_88, x_12, x_91);
+if (lean_obj_tag(x_95) == 0)
+{
+lean_object* x_96; lean_object* x_97; lean_object* x_98; 
+x_96 = lean_ctor_get(x_95, 0);
+lean_inc(x_96);
+x_97 = lean_ctor_get(x_95, 1);
+lean_inc(x_97);
+lean_dec(x_95);
+x_98 = l_Array_unzip___rarg(x_96);
+lean_dec(x_96);
 if (lean_obj_tag(x_6) == 0)
 {
-lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; 
-x_97 = lean_ctor_get(x_96, 0);
-lean_inc(x_97);
-x_98 = lean_ctor_get(x_96, 1);
-lean_inc(x_98);
-lean_dec(x_96);
-x_99 = l_Lean_Syntax_getId(x_22);
-lean_inc(x_97);
-x_100 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_100, 0, x_29);
-lean_ctor_set(x_100, 1, x_30);
-lean_ctor_set(x_100, 2, x_97);
-x_101 = lean_alloc_closure((void*)(l_Lean_Elab_Command_mkNameFromParserSyntax), 4, 2);
-lean_closure_set(x_101, 0, x_99);
-lean_closure_set(x_101, 1, x_100);
+lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; 
+x_99 = lean_ctor_get(x_98, 0);
+lean_inc(x_99);
+x_100 = lean_ctor_get(x_98, 1);
+lean_inc(x_100);
+lean_dec(x_98);
+x_101 = l_Lean_Syntax_getId(x_22);
+lean_inc(x_99);
+x_102 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_102, 0, x_29);
+lean_ctor_set(x_102, 1, x_30);
+lean_ctor_set(x_102, 2, x_99);
+x_103 = lean_alloc_closure((void*)(l_Lean_Elab_Command_mkNameFromParserSyntax), 4, 2);
+lean_closure_set(x_103, 0, x_101);
+lean_closure_set(x_103, 1, x_102);
 lean_inc(x_12);
-lean_inc(x_86);
-x_102 = l_Lean_Elab_liftMacroM___at_Lean_Elab_Command_elabSyntax___spec__9(x_101, x_86, x_12, x_95);
-if (lean_obj_tag(x_102) == 0)
+lean_inc(x_88);
+x_104 = l_Lean_Elab_liftMacroM___at_Lean_Elab_Command_elabSyntax___spec__9(x_103, x_88, x_12, x_97);
+if (lean_obj_tag(x_104) == 0)
 {
-lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; 
-x_103 = lean_ctor_get(x_102, 0);
-lean_inc(x_103);
-x_104 = lean_ctor_get(x_102, 1);
-lean_inc(x_104);
-lean_dec(x_102);
-lean_inc(x_5);
-x_105 = l_Lean_Elab_Command_addMacroScopeIfLocal___at_Lean_Elab_Command_elabSyntax___spec__13(x_103, x_5, x_86, x_12, x_104);
-x_106 = lean_ctor_get(x_105, 0);
+lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; lean_object* x_110; 
+x_105 = lean_ctor_get(x_104, 0);
+lean_inc(x_105);
+x_106 = lean_ctor_get(x_104, 1);
 lean_inc(x_106);
-x_107 = lean_ctor_get(x_105, 1);
-lean_inc(x_107);
-lean_dec(x_105);
-x_108 = l_Lean_Elab_Command_elabMacro___lambda__2(x_98, x_26, x_30, x_24, x_3, x_4, x_22, x_88, x_97, x_92, x_5, x_6, x_2, x_7, x_8, x_106, x_86, x_12, x_107);
-return x_108;
+lean_dec(x_104);
+lean_inc(x_5);
+x_107 = l_Lean_Elab_Command_addMacroScopeIfLocal___at_Lean_Elab_Command_elabSyntax___spec__13(x_105, x_5, x_88, x_12, x_106);
+x_108 = lean_ctor_get(x_107, 0);
+lean_inc(x_108);
+x_109 = lean_ctor_get(x_107, 1);
+lean_inc(x_109);
+lean_dec(x_107);
+x_110 = l_Lean_Elab_Command_elabMacro___lambda__2(x_100, x_26, x_30, x_24, x_3, x_4, x_22, x_90, x_99, x_94, x_5, x_6, x_2, x_7, x_8, x_108, x_88, x_12, x_109);
+return x_110;
 }
 else
 {
-lean_object* x_109; lean_object* x_110; lean_object* x_111; lean_object* x_112; 
-lean_dec(x_98);
-lean_dec(x_97);
+lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; 
+lean_dec(x_100);
+lean_dec(x_99);
+lean_dec(x_90);
 lean_dec(x_88);
-lean_dec(x_86);
 lean_dec(x_24);
 lean_dec(x_22);
 lean_dec(x_12);
@@ -3711,49 +3716,49 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_109 = lean_ctor_get(x_102, 0);
-lean_inc(x_109);
-x_110 = lean_ctor_get(x_102, 1);
-lean_inc(x_110);
-if (lean_is_exclusive(x_102)) {
- lean_ctor_release(x_102, 0);
- lean_ctor_release(x_102, 1);
- x_111 = x_102;
+x_111 = lean_ctor_get(x_104, 0);
+lean_inc(x_111);
+x_112 = lean_ctor_get(x_104, 1);
+lean_inc(x_112);
+if (lean_is_exclusive(x_104)) {
+ lean_ctor_release(x_104, 0);
+ lean_ctor_release(x_104, 1);
+ x_113 = x_104;
 } else {
- lean_dec_ref(x_102);
- x_111 = lean_box(0);
+ lean_dec_ref(x_104);
+ x_113 = lean_box(0);
 }
-if (lean_is_scalar(x_111)) {
- x_112 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_113)) {
+ x_114 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_112 = x_111;
+ x_114 = x_113;
 }
-lean_ctor_set(x_112, 0, x_109);
-lean_ctor_set(x_112, 1, x_110);
-return x_112;
+lean_ctor_set(x_114, 0, x_111);
+lean_ctor_set(x_114, 1, x_112);
+return x_114;
 }
 }
 else
 {
-lean_object* x_113; lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; 
-x_113 = lean_ctor_get(x_96, 0);
-lean_inc(x_113);
-x_114 = lean_ctor_get(x_96, 1);
-lean_inc(x_114);
-lean_dec(x_96);
-x_115 = lean_ctor_get(x_6, 0);
+lean_object* x_115; lean_object* x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; 
+x_115 = lean_ctor_get(x_98, 0);
 lean_inc(x_115);
-x_116 = l_Lean_Syntax_getId(x_115);
-lean_dec(x_115);
-x_117 = l_Lean_Elab_Command_elabMacro___lambda__2(x_114, x_26, x_30, x_24, x_3, x_4, x_22, x_88, x_113, x_92, x_5, x_6, x_2, x_7, x_8, x_116, x_86, x_12, x_95);
-return x_117;
+x_116 = lean_ctor_get(x_98, 1);
+lean_inc(x_116);
+lean_dec(x_98);
+x_117 = lean_ctor_get(x_6, 0);
+lean_inc(x_117);
+x_118 = l_Lean_Syntax_getId(x_117);
+lean_dec(x_117);
+x_119 = l_Lean_Elab_Command_elabMacro___lambda__2(x_116, x_26, x_30, x_24, x_3, x_4, x_22, x_90, x_115, x_94, x_5, x_6, x_2, x_7, x_8, x_118, x_88, x_12, x_97);
+return x_119;
 }
 }
 else
 {
-lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; 
+lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; 
+lean_dec(x_90);
 lean_dec(x_88);
-lean_dec(x_86);
 lean_dec(x_24);
 lean_dec(x_22);
 lean_dec(x_12);
@@ -3764,32 +3769,32 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_118 = lean_ctor_get(x_93, 0);
-lean_inc(x_118);
-x_119 = lean_ctor_get(x_93, 1);
-lean_inc(x_119);
-if (lean_is_exclusive(x_93)) {
- lean_ctor_release(x_93, 0);
- lean_ctor_release(x_93, 1);
- x_120 = x_93;
+x_120 = lean_ctor_get(x_95, 0);
+lean_inc(x_120);
+x_121 = lean_ctor_get(x_95, 1);
+lean_inc(x_121);
+if (lean_is_exclusive(x_95)) {
+ lean_ctor_release(x_95, 0);
+ lean_ctor_release(x_95, 1);
+ x_122 = x_95;
 } else {
- lean_dec_ref(x_93);
- x_120 = lean_box(0);
+ lean_dec_ref(x_95);
+ x_122 = lean_box(0);
 }
-if (lean_is_scalar(x_120)) {
- x_121 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_122)) {
+ x_123 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_121 = x_120;
+ x_123 = x_122;
 }
-lean_ctor_set(x_121, 0, x_118);
-lean_ctor_set(x_121, 1, x_119);
-return x_121;
+lean_ctor_set(x_123, 0, x_120);
+lean_ctor_set(x_123, 1, x_121);
+return x_123;
 }
 }
 else
 {
-lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; 
-lean_dec(x_86);
+lean_object* x_124; lean_object* x_125; lean_object* x_126; lean_object* x_127; 
+lean_dec(x_88);
 lean_dec(x_25);
 lean_dec(x_24);
 lean_dec(x_22);
@@ -3801,26 +3806,26 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_122 = lean_ctor_get(x_87, 0);
-lean_inc(x_122);
-x_123 = lean_ctor_get(x_87, 1);
-lean_inc(x_123);
-if (lean_is_exclusive(x_87)) {
- lean_ctor_release(x_87, 0);
- lean_ctor_release(x_87, 1);
- x_124 = x_87;
+x_124 = lean_ctor_get(x_89, 0);
+lean_inc(x_124);
+x_125 = lean_ctor_get(x_89, 1);
+lean_inc(x_125);
+if (lean_is_exclusive(x_89)) {
+ lean_ctor_release(x_89, 0);
+ lean_ctor_release(x_89, 1);
+ x_126 = x_89;
 } else {
- lean_dec_ref(x_87);
- x_124 = lean_box(0);
+ lean_dec_ref(x_89);
+ x_126 = lean_box(0);
 }
-if (lean_is_scalar(x_124)) {
- x_125 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_126)) {
+ x_127 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_125 = x_124;
+ x_127 = x_126;
 }
-lean_ctor_set(x_125, 0, x_122);
-lean_ctor_set(x_125, 1, x_123);
-return x_125;
+lean_ctor_set(x_127, 0, x_124);
+lean_ctor_set(x_127, 1, x_125);
+return x_127;
 }
 }
 }

stage0/stdlib/Lean/Elab/PreDefinition/MkInhabitant.c

@@ -14,6 +14,7 @@
 extern "C" {
 #endif
 lean_object* lean_mk_empty_array_with_capacity(lean_object*);
+uint8_t l_Lean_Exception_isInterrupt(lean_object*);
 lean_object* l_Lean_Meta_isExprDefEq(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_push(lean_object*, lean_object*);
 lean_object* l_Array_toSubarray___rarg(lean_object*, lean_object*, lean_object*);
@@ -60,176 +61,133 @@ lean_object* l_Lean_MessageData_ofName(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_PreDefinition_MkInhabitant_0__Lean_Elab_mkInhabitant_x3f(lean_object* x_1, uint8_t x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
+lean_object* x_8; lean_object* x_9; 
 if (x_2 == 0)
 {
-lean_object* x_8; 
-x_8 = l_Lean_Meta_mkDefault(x_1, x_3, x_4, x_5, x_6, x_7);
-if (lean_obj_tag(x_8) == 0)
+lean_object* x_17; 
+x_17 = l_Lean_Meta_mkDefault(x_1, x_3, x_4, x_5, x_6, x_7);
+if (lean_obj_tag(x_17) == 0)
 {
-uint8_t x_9; 
-x_9 = !lean_is_exclusive(x_8);
-if (x_9 == 0)
-{
-lean_object* x_10; lean_object* x_11; 
-x_10 = lean_ctor_get(x_8, 0);
-x_11 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_11, 0, x_10);
-lean_ctor_set(x_8, 0, x_11);
-return x_8;
-}
-else
-{
-lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; 
-x_12 = lean_ctor_get(x_8, 0);
-x_13 = lean_ctor_get(x_8, 1);
-lean_inc(x_13);
-lean_inc(x_12);
-lean_dec(x_8);
-x_14 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_14, 0, x_12);
-x_15 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_15, 0, x_14);
-lean_ctor_set(x_15, 1, x_13);
-return x_15;
-}
-}
-else
-{
-uint8_t x_16; 
-x_16 = !lean_is_exclusive(x_8);
-if (x_16 == 0)
-{
-lean_object* x_17; uint8_t x_18; 
-x_17 = lean_ctor_get(x_8, 0);
-x_18 = l_Lean_Exception_isRuntime(x_17);
+uint8_t x_18; 
+x_18 = !lean_is_exclusive(x_17);
 if (x_18 == 0)
 {
-lean_object* x_19; 
-lean_dec(x_17);
-x_19 = lean_box(0);
-lean_ctor_set_tag(x_8, 0);
-lean_ctor_set(x_8, 0, x_19);
-return x_8;
+lean_object* x_19; lean_object* x_20; 
+x_19 = lean_ctor_get(x_17, 0);
+x_20 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_20, 0, x_19);
+lean_ctor_set(x_17, 0, x_20);
+return x_17;
 }
 else
 {
-return x_8;
-}
-}
-else
-{
-lean_object* x_20; lean_object* x_21; uint8_t x_22; 
-x_20 = lean_ctor_get(x_8, 0);
-x_21 = lean_ctor_get(x_8, 1);
+lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; 
+x_21 = lean_ctor_get(x_17, 0);
+x_22 = lean_ctor_get(x_17, 1);
+lean_inc(x_22);
 lean_inc(x_21);
-lean_inc(x_20);
-lean_dec(x_8);
-x_22 = l_Lean_Exception_isRuntime(x_20);
-if (x_22 == 0)
-{
-lean_object* x_23; lean_object* x_24; 
-lean_dec(x_20);
-x_23 = lean_box(0);
+lean_dec(x_17);
+x_23 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_23, 0, x_21);
 x_24 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_24, 0, x_23);
-lean_ctor_set(x_24, 1, x_21);
+lean_ctor_set(x_24, 1, x_22);
 return x_24;
 }
+}
 else
 {
-lean_object* x_25; 
-x_25 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_25, 0, x_20);
-lean_ctor_set(x_25, 1, x_21);
-return x_25;
-}
-}
+lean_object* x_25; lean_object* x_26; 
+x_25 = lean_ctor_get(x_17, 0);
+lean_inc(x_25);
+x_26 = lean_ctor_get(x_17, 1);
+lean_inc(x_26);
+lean_dec(x_17);
+x_8 = x_25;
+x_9 = x_26;
+goto block_16;
 }
 }
 else
 {
-lean_object* x_26; 
-x_26 = l_Lean_Meta_mkOfNonempty(x_1, x_3, x_4, x_5, x_6, x_7);
-if (lean_obj_tag(x_26) == 0)
+lean_object* x_27; 
+x_27 = l_Lean_Meta_mkOfNonempty(x_1, x_3, x_4, x_5, x_6, x_7);
+if (lean_obj_tag(x_27) == 0)
 {
-uint8_t x_27; 
-x_27 = !lean_is_exclusive(x_26);
-if (x_27 == 0)
+uint8_t x_28; 
+x_28 = !lean_is_exclusive(x_27);
+if (x_28 == 0)
 {
-lean_object* x_28; lean_object* x_29; 
-x_28 = lean_ctor_get(x_26, 0);
-x_29 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_29, 0, x_28);
-lean_ctor_set(x_26, 0, x_29);
-return x_26;
+lean_object* x_29; lean_object* x_30; 
+x_29 = lean_ctor_get(x_27, 0);
+x_30 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_30, 0, x_29);
+lean_ctor_set(x_27, 0, x_30);
+return x_27;
 }
 else
 {
-lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; 
-x_30 = lean_ctor_get(x_26, 0);
-x_31 = lean_ctor_get(x_26, 1);
+lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; 
+x_31 = lean_ctor_get(x_27, 0);
+x_32 = lean_ctor_get(x_27, 1);
+lean_inc(x_32);
 lean_inc(x_31);
-lean_inc(x_30);
-lean_dec(x_26);
-x_32 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_32, 0, x_30);
-x_33 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_33, 0, x_32);
-lean_ctor_set(x_33, 1, x_31);
-return x_33;
+lean_dec(x_27);
+x_33 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_33, 0, x_31);
+x_34 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_34, 0, x_33);
+lean_ctor_set(x_34, 1, x_32);
+return x_34;
 }
 }
 else
 {
-uint8_t x_34; 
-x_34 = !lean_is_exclusive(x_26);
-if (x_34 == 0)
+lean_object* x_35; lean_object* x_36; 
+x_35 = lean_ctor_get(x_27, 0);
+lean_inc(x_35);
+x_36 = lean_ctor_get(x_27, 1);
+lean_inc(x_36);
+lean_dec(x_27);
+x_8 = x_35;
+x_9 = x_36;
+goto block_16;
+}
+}
+block_16:
 {
-lean_object* x_35; uint8_t x_36; 
-x_35 = lean_ctor_get(x_26, 0);
-x_36 = l_Lean_Exception_isRuntime(x_35);
-if (x_36 == 0)
+uint8_t x_10; 
+x_10 = l_Lean_Exception_isInterrupt(x_8);
+if (x_10 == 0)
 {
-lean_object* x_37; 
-lean_dec(x_35);
-x_37 = lean_box(0);
-lean_ctor_set_tag(x_26, 0);
-lean_ctor_set(x_26, 0, x_37);
-return x_26;
+uint8_t x_11; 
+x_11 = l_Lean_Exception_isRuntime(x_8);
+if (x_11 == 0)
+{
+lean_object* x_12; lean_object* x_13; 
+lean_dec(x_8);
+x_12 = lean_box(0);
+x_13 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_13, 0, x_12);
+lean_ctor_set(x_13, 1, x_9);
+return x_13;
 }
 else
 {
-return x_26;
+lean_object* x_14; 
+x_14 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_14, 0, x_8);
+lean_ctor_set(x_14, 1, x_9);
+return x_14;
 }
 }
 else
 {
-lean_object* x_38; lean_object* x_39; uint8_t x_40; 
-x_38 = lean_ctor_get(x_26, 0);
-x_39 = lean_ctor_get(x_26, 1);
-lean_inc(x_39);
-lean_inc(x_38);
-lean_dec(x_26);
-x_40 = l_Lean_Exception_isRuntime(x_38);
-if (x_40 == 0)
-{
-lean_object* x_41; lean_object* x_42; 
-lean_dec(x_38);
-x_41 = lean_box(0);
-x_42 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_42, 0, x_41);
-lean_ctor_set(x_42, 1, x_39);
-return x_42;
-}
-else
-{
-lean_object* x_43; 
-x_43 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_43, 0, x_38);
-lean_ctor_set(x_43, 1, x_39);
-return x_43;
-}
-}
+lean_object* x_15; 
+x_15 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_15, 0, x_8);
+lean_ctor_set(x_15, 1, x_9);
+return x_15;
 }
 }
 }

stage0/stdlib/Lean/Elab/PreDefinition/Structural/Eqns.c

@@ -2538,7 +2538,7 @@ x_14 = l_Lean_Elab_Structural_mkEqns___lambda__2___closed__1;
 x_15 = l_Lean_Option_get___at_Lean_profiler_threshold_getSecs___spec__1(x_1, x_14);
 lean_ctor_set(x_8, 4, x_15);
 lean_ctor_set(x_8, 2, x_1);
-lean_ctor_set_uint8(x_8, sizeof(void*)*11, x_2);
+lean_ctor_set_uint8(x_8, sizeof(void*)*12, x_2);
 x_16 = 0;
 lean_inc(x_9);
 lean_inc(x_8);
@@ -2640,7 +2640,7 @@ return x_38;
 }
 else
 {
-lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; uint8_t x_51; lean_object* x_52; 
+lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; uint8_t x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; uint8_t x_53; lean_object* x_54; 
 x_39 = lean_ctor_get(x_8, 0);
 x_40 = lean_ctor_get(x_8, 1);
 x_41 = lean_ctor_get(x_8, 3);
@@ -2650,6 +2650,9 @@ x_44 = lean_ctor_get(x_8, 7);
 x_45 = lean_ctor_get(x_8, 8);
 x_46 = lean_ctor_get(x_8, 9);
 x_47 = lean_ctor_get(x_8, 10);
+x_48 = lean_ctor_get(x_8, 11);
+x_49 = lean_ctor_get_uint8(x_8, sizeof(void*)*12 + 1);
+lean_inc(x_48);
 lean_inc(x_47);
 lean_inc(x_46);
 lean_inc(x_45);
@@ -2660,124 +2663,126 @@ lean_inc(x_41);
 lean_inc(x_40);
 lean_inc(x_39);
 lean_dec(x_8);
-x_48 = l_Lean_Elab_Structural_mkEqns___lambda__2___closed__1;
-x_49 = l_Lean_Option_get___at_Lean_profiler_threshold_getSecs___spec__1(x_1, x_48);
-x_50 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_50, 0, x_39);
-lean_ctor_set(x_50, 1, x_40);
-lean_ctor_set(x_50, 2, x_1);
-lean_ctor_set(x_50, 3, x_41);
-lean_ctor_set(x_50, 4, x_49);
-lean_ctor_set(x_50, 5, x_42);
-lean_ctor_set(x_50, 6, x_43);
-lean_ctor_set(x_50, 7, x_44);
-lean_ctor_set(x_50, 8, x_45);
-lean_ctor_set(x_50, 9, x_46);
-lean_ctor_set(x_50, 10, x_47);
-lean_ctor_set_uint8(x_50, sizeof(void*)*11, x_2);
-x_51 = 0;
+x_50 = l_Lean_Elab_Structural_mkEqns___lambda__2___closed__1;
+x_51 = l_Lean_Option_get___at_Lean_profiler_threshold_getSecs___spec__1(x_1, x_50);
+x_52 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_52, 0, x_39);
+lean_ctor_set(x_52, 1, x_40);
+lean_ctor_set(x_52, 2, x_1);
+lean_ctor_set(x_52, 3, x_41);
+lean_ctor_set(x_52, 4, x_51);
+lean_ctor_set(x_52, 5, x_42);
+lean_ctor_set(x_52, 6, x_43);
+lean_ctor_set(x_52, 7, x_44);
+lean_ctor_set(x_52, 8, x_45);
+lean_ctor_set(x_52, 9, x_46);
+lean_ctor_set(x_52, 10, x_47);
+lean_ctor_set(x_52, 11, x_48);
+lean_ctor_set_uint8(x_52, sizeof(void*)*12, x_2);
+lean_ctor_set_uint8(x_52, sizeof(void*)*12 + 1, x_49);
+x_53 = 0;
 lean_inc(x_9);
-lean_inc(x_50);
+lean_inc(x_52);
 lean_inc(x_5);
 lean_inc(x_4);
-x_52 = l_Lean_Meta_withNewMCtxDepth___at_Lean_Meta_matchesInstance___spec__1___rarg(x_3, x_51, x_4, x_5, x_50, x_9, x_10);
-if (lean_obj_tag(x_52) == 0)
+x_54 = l_Lean_Meta_withNewMCtxDepth___at_Lean_Meta_matchesInstance___spec__1___rarg(x_3, x_53, x_4, x_5, x_52, x_9, x_10);
+if (lean_obj_tag(x_54) == 0)
 {
-lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; 
-x_53 = lean_ctor_get(x_52, 0);
-lean_inc(x_53);
-x_54 = lean_ctor_get(x_52, 1);
-lean_inc(x_54);
-lean_dec(x_52);
-x_55 = lean_ctor_get(x_6, 0);
+lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; 
+x_55 = lean_ctor_get(x_54, 0);
 lean_inc(x_55);
-x_56 = lean_box(0);
-x_57 = lean_array_get_size(x_53);
-x_58 = lean_unsigned_to_nat(0u);
-x_59 = lean_unsigned_to_nat(1u);
-x_60 = l___private_Lean_Elab_PreDefinition_Structural_Eqns_0__Lean_Elab_Structural_mkProof_go___lambda__1___closed__3;
+x_56 = lean_ctor_get(x_54, 1);
+lean_inc(x_56);
+lean_dec(x_54);
+x_57 = lean_ctor_get(x_6, 0);
 lean_inc(x_57);
-x_61 = l_Std_Range_forIn_loop___at_Lean_Elab_Structural_mkEqns___spec__1(x_6, x_53, x_55, x_56, x_57, x_57, x_58, x_57, x_59, x_60, x_4, x_5, x_50, x_9, x_54);
-lean_dec(x_57);
-lean_dec(x_53);
+x_58 = lean_box(0);
+x_59 = lean_array_get_size(x_55);
+x_60 = lean_unsigned_to_nat(0u);
+x_61 = lean_unsigned_to_nat(1u);
+x_62 = l___private_Lean_Elab_PreDefinition_Structural_Eqns_0__Lean_Elab_Structural_mkProof_go___lambda__1___closed__3;
+lean_inc(x_59);
+x_63 = l_Std_Range_forIn_loop___at_Lean_Elab_Structural_mkEqns___spec__1(x_6, x_55, x_57, x_58, x_59, x_59, x_60, x_59, x_61, x_62, x_4, x_5, x_52, x_9, x_56);
+lean_dec(x_59);
+lean_dec(x_55);
 lean_dec(x_6);
-if (lean_obj_tag(x_61) == 0)
+if (lean_obj_tag(x_63) == 0)
 {
-lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; 
-x_62 = lean_ctor_get(x_61, 0);
-lean_inc(x_62);
-x_63 = lean_ctor_get(x_61, 1);
-lean_inc(x_63);
-if (lean_is_exclusive(x_61)) {
- lean_ctor_release(x_61, 0);
- lean_ctor_release(x_61, 1);
- x_64 = x_61;
+lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; 
+x_64 = lean_ctor_get(x_63, 0);
+lean_inc(x_64);
+x_65 = lean_ctor_get(x_63, 1);
+lean_inc(x_65);
+if (lean_is_exclusive(x_63)) {
+ lean_ctor_release(x_63, 0);
+ lean_ctor_release(x_63, 1);
+ x_66 = x_63;
 } else {
- lean_dec_ref(x_61);
- x_64 = lean_box(0);
+ lean_dec_ref(x_63);
+ x_66 = lean_box(0);
 }
-if (lean_is_scalar(x_64)) {
- x_65 = lean_alloc_ctor(0, 2, 0);
+if (lean_is_scalar(x_66)) {
+ x_67 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_65 = x_64;
+ x_67 = x_66;
 }
-lean_ctor_set(x_65, 0, x_62);
-lean_ctor_set(x_65, 1, x_63);
-return x_65;
+lean_ctor_set(x_67, 0, x_64);
+lean_ctor_set(x_67, 1, x_65);
+return x_67;
 }
 else
 {
-lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; 
-x_66 = lean_ctor_get(x_61, 0);
-lean_inc(x_66);
-x_67 = lean_ctor_get(x_61, 1);
-lean_inc(x_67);
-if (lean_is_exclusive(x_61)) {
- lean_ctor_release(x_61, 0);
- lean_ctor_release(x_61, 1);
- x_68 = x_61;
+lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; 
+x_68 = lean_ctor_get(x_63, 0);
+lean_inc(x_68);
+x_69 = lean_ctor_get(x_63, 1);
+lean_inc(x_69);
+if (lean_is_exclusive(x_63)) {
+ lean_ctor_release(x_63, 0);
+ lean_ctor_release(x_63, 1);
+ x_70 = x_63;
 } else {
- lean_dec_ref(x_61);
- x_68 = lean_box(0);
+ lean_dec_ref(x_63);
+ x_70 = lean_box(0);
 }
-if (lean_is_scalar(x_68)) {
- x_69 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_70)) {
+ x_71 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_69 = x_68;
+ x_71 = x_70;
 }
-lean_ctor_set(x_69, 0, x_66);
-lean_ctor_set(x_69, 1, x_67);
-return x_69;
+lean_ctor_set(x_71, 0, x_68);
+lean_ctor_set(x_71, 1, x_69);
+return x_71;
 }
 }
 else
 {
-lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; 
-lean_dec(x_50);
+lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; 
+lean_dec(x_52);
 lean_dec(x_9);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-x_70 = lean_ctor_get(x_52, 0);
-lean_inc(x_70);
-x_71 = lean_ctor_get(x_52, 1);
-lean_inc(x_71);
-if (lean_is_exclusive(x_52)) {
- lean_ctor_release(x_52, 0);
- lean_ctor_release(x_52, 1);
- x_72 = x_52;
+x_72 = lean_ctor_get(x_54, 0);
+lean_inc(x_72);
+x_73 = lean_ctor_get(x_54, 1);
+lean_inc(x_73);
+if (lean_is_exclusive(x_54)) {
+ lean_ctor_release(x_54, 0);
+ lean_ctor_release(x_54, 1);
+ x_74 = x_54;
 } else {
- lean_dec_ref(x_52);
- x_72 = lean_box(0);
+ lean_dec_ref(x_54);
+ x_74 = lean_box(0);
 }
-if (lean_is_scalar(x_72)) {
- x_73 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_74)) {
+ x_75 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_73 = x_72;
+ x_75 = x_74;
 }
-lean_ctor_set(x_73, 0, x_70);
-lean_ctor_set(x_73, 1, x_71);
-return x_73;
+lean_ctor_set(x_75, 0, x_72);
+lean_ctor_set(x_75, 1, x_73);
+return x_75;
 }
 }
 }

stage0/stdlib/Lean/Elab/PreDefinition/Structural/IndPred.c

@@ -5332,7 +5332,7 @@ return x_131;
 }
 else
 {
-lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; uint8_t x_145; lean_object* x_146; 
+lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; uint8_t x_145; lean_object* x_146; uint8_t x_147; lean_object* x_148; 
 lean_dec(x_117);
 x_132 = lean_ctor_get(x_119, 0);
 lean_inc(x_132);
@@ -5362,98 +5362,103 @@ x_143 = lean_ctor_get(x_9, 9);
 lean_inc(x_143);
 x_144 = lean_ctor_get(x_9, 10);
 lean_inc(x_144);
-x_145 = lean_ctor_get_uint8(x_9, sizeof(void*)*11);
+x_145 = lean_ctor_get_uint8(x_9, sizeof(void*)*12);
+x_146 = lean_ctor_get(x_9, 11);
+lean_inc(x_146);
+x_147 = lean_ctor_get_uint8(x_9, sizeof(void*)*12 + 1);
 lean_dec(x_9);
-x_146 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_146, 0, x_135);
-lean_ctor_set(x_146, 1, x_136);
-lean_ctor_set(x_146, 2, x_137);
-lean_ctor_set(x_146, 3, x_138);
-lean_ctor_set(x_146, 4, x_139);
-lean_ctor_set(x_146, 5, x_134);
-lean_ctor_set(x_146, 6, x_140);
-lean_ctor_set(x_146, 7, x_141);
-lean_ctor_set(x_146, 8, x_142);
-lean_ctor_set(x_146, 9, x_143);
-lean_ctor_set(x_146, 10, x_144);
-lean_ctor_set_uint8(x_146, sizeof(void*)*11, x_145);
+x_148 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_148, 0, x_135);
+lean_ctor_set(x_148, 1, x_136);
+lean_ctor_set(x_148, 2, x_137);
+lean_ctor_set(x_148, 3, x_138);
+lean_ctor_set(x_148, 4, x_139);
+lean_ctor_set(x_148, 5, x_134);
+lean_ctor_set(x_148, 6, x_140);
+lean_ctor_set(x_148, 7, x_141);
+lean_ctor_set(x_148, 8, x_142);
+lean_ctor_set(x_148, 9, x_143);
+lean_ctor_set(x_148, 10, x_144);
+lean_ctor_set(x_148, 11, x_146);
+lean_ctor_set_uint8(x_148, sizeof(void*)*12, x_145);
+lean_ctor_set_uint8(x_148, sizeof(void*)*12 + 1, x_147);
 x_5 = x_118;
-x_9 = x_146;
+x_9 = x_148;
 goto _start;
 }
 }
 case 11:
 {
-lean_object* x_148; lean_object* x_149; lean_object* x_150; lean_object* x_151; 
-x_148 = lean_ctor_get(x_5, 0);
-lean_inc(x_148);
-x_149 = lean_ctor_get(x_5, 1);
-lean_inc(x_149);
-x_150 = lean_ctor_get(x_5, 2);
+lean_object* x_150; lean_object* x_151; lean_object* x_152; lean_object* x_153; 
+x_150 = lean_ctor_get(x_5, 0);
 lean_inc(x_150);
+x_151 = lean_ctor_get(x_5, 1);
+lean_inc(x_151);
+x_152 = lean_ctor_get(x_5, 2);
+lean_inc(x_152);
 lean_dec(x_5);
-x_151 = l___private_Lean_Elab_PreDefinition_Structural_IndPred_0__Lean_Elab_Structural_replaceIndPredRecApps_loop(x_1, x_2, x_3, x_4, x_150, x_6, x_7, x_8, x_9, x_10, x_11);
-if (lean_obj_tag(x_151) == 0)
+x_153 = l___private_Lean_Elab_PreDefinition_Structural_IndPred_0__Lean_Elab_Structural_replaceIndPredRecApps_loop(x_1, x_2, x_3, x_4, x_152, x_6, x_7, x_8, x_9, x_10, x_11);
+if (lean_obj_tag(x_153) == 0)
 {
-uint8_t x_152; 
-x_152 = !lean_is_exclusive(x_151);
-if (x_152 == 0)
+uint8_t x_154; 
+x_154 = !lean_is_exclusive(x_153);
+if (x_154 == 0)
 {
-lean_object* x_153; lean_object* x_154; 
-x_153 = lean_ctor_get(x_151, 0);
-x_154 = l_Lean_Expr_proj___override(x_148, x_149, x_153);
-lean_ctor_set(x_151, 0, x_154);
-return x_151;
+lean_object* x_155; lean_object* x_156; 
+x_155 = lean_ctor_get(x_153, 0);
+x_156 = l_Lean_Expr_proj___override(x_150, x_151, x_155);
+lean_ctor_set(x_153, 0, x_156);
+return x_153;
 }
 else
 {
-lean_object* x_155; lean_object* x_156; lean_object* x_157; lean_object* x_158; 
-x_155 = lean_ctor_get(x_151, 0);
-x_156 = lean_ctor_get(x_151, 1);
-lean_inc(x_156);
-lean_inc(x_155);
+lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; 
+x_157 = lean_ctor_get(x_153, 0);
+x_158 = lean_ctor_get(x_153, 1);
+lean_inc(x_158);
+lean_inc(x_157);
+lean_dec(x_153);
+x_159 = l_Lean_Expr_proj___override(x_150, x_151, x_157);
+x_160 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_160, 0, x_159);
+lean_ctor_set(x_160, 1, x_158);
+return x_160;
+}
+}
+else
+{
+uint8_t x_161; 
 lean_dec(x_151);
-x_157 = l_Lean_Expr_proj___override(x_148, x_149, x_155);
-x_158 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_158, 0, x_157);
-lean_ctor_set(x_158, 1, x_156);
-return x_158;
-}
+lean_dec(x_150);
+x_161 = !lean_is_exclusive(x_153);
+if (x_161 == 0)
+{
+return x_153;
 }
 else
 {
-uint8_t x_159; 
-lean_dec(x_149);
-lean_dec(x_148);
-x_159 = !lean_is_exclusive(x_151);
-if (x_159 == 0)
-{
-return x_151;
-}
-else
-{
-lean_object* x_160; lean_object* x_161; lean_object* x_162; 
-x_160 = lean_ctor_get(x_151, 0);
-x_161 = lean_ctor_get(x_151, 1);
-lean_inc(x_161);
-lean_inc(x_160);
-lean_dec(x_151);
-x_162 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_162, 0, x_160);
-lean_ctor_set(x_162, 1, x_161);
-return x_162;
+lean_object* x_162; lean_object* x_163; lean_object* x_164; 
+x_162 = lean_ctor_get(x_153, 0);
+x_163 = lean_ctor_get(x_153, 1);
+lean_inc(x_163);
+lean_inc(x_162);
+lean_dec(x_153);
+x_164 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_164, 0, x_162);
+lean_ctor_set(x_164, 1, x_163);
+return x_164;
 }
 }
 }
 default: 
 {
-lean_object* x_163; 
+lean_object* x_165; 
 lean_dec(x_6);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_163 = l_Lean_Elab_ensureNoRecFn(x_1, x_5, x_7, x_8, x_9, x_10, x_11);
-return x_163;
+x_165 = l_Lean_Elab_ensureNoRecFn(x_1, x_5, x_7, x_8, x_9, x_10, x_11);
+return x_165;
 }
 }
 }

stage0/stdlib/Lean/Elab/PreDefinition/WF/Eqns.c

@@ -3695,7 +3695,7 @@ x_15 = l_Lean_Elab_WF_mkEqns___lambda__2___closed__1;
 x_16 = l_Lean_Option_get___at_Lean_profiler_threshold_getSecs___spec__1(x_1, x_15);
 lean_ctor_set(x_9, 4, x_16);
 lean_ctor_set(x_9, 2, x_1);
-lean_ctor_set_uint8(x_9, sizeof(void*)*11, x_2);
+lean_ctor_set_uint8(x_9, sizeof(void*)*12, x_2);
 x_17 = 0;
 lean_inc(x_10);
 lean_inc(x_9);
@@ -3794,7 +3794,7 @@ return x_38;
 }
 else
 {
-lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; uint8_t x_51; lean_object* x_52; 
+lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; uint8_t x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; uint8_t x_53; lean_object* x_54; 
 x_39 = lean_ctor_get(x_9, 0);
 x_40 = lean_ctor_get(x_9, 1);
 x_41 = lean_ctor_get(x_9, 3);
@@ -3804,6 +3804,9 @@ x_44 = lean_ctor_get(x_9, 7);
 x_45 = lean_ctor_get(x_9, 8);
 x_46 = lean_ctor_get(x_9, 9);
 x_47 = lean_ctor_get(x_9, 10);
+x_48 = lean_ctor_get(x_9, 11);
+x_49 = lean_ctor_get_uint8(x_9, sizeof(void*)*12 + 1);
+lean_inc(x_48);
 lean_inc(x_47);
 lean_inc(x_46);
 lean_inc(x_45);
@@ -3814,121 +3817,123 @@ lean_inc(x_41);
 lean_inc(x_40);
 lean_inc(x_39);
 lean_dec(x_9);
-x_48 = l_Lean_Elab_WF_mkEqns___lambda__2___closed__1;
-x_49 = l_Lean_Option_get___at_Lean_profiler_threshold_getSecs___spec__1(x_1, x_48);
-x_50 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_50, 0, x_39);
-lean_ctor_set(x_50, 1, x_40);
-lean_ctor_set(x_50, 2, x_1);
-lean_ctor_set(x_50, 3, x_41);
-lean_ctor_set(x_50, 4, x_49);
-lean_ctor_set(x_50, 5, x_42);
-lean_ctor_set(x_50, 6, x_43);
-lean_ctor_set(x_50, 7, x_44);
-lean_ctor_set(x_50, 8, x_45);
-lean_ctor_set(x_50, 9, x_46);
-lean_ctor_set(x_50, 10, x_47);
-lean_ctor_set_uint8(x_50, sizeof(void*)*11, x_2);
-x_51 = 0;
+x_50 = l_Lean_Elab_WF_mkEqns___lambda__2___closed__1;
+x_51 = l_Lean_Option_get___at_Lean_profiler_threshold_getSecs___spec__1(x_1, x_50);
+x_52 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_52, 0, x_39);
+lean_ctor_set(x_52, 1, x_40);
+lean_ctor_set(x_52, 2, x_1);
+lean_ctor_set(x_52, 3, x_41);
+lean_ctor_set(x_52, 4, x_51);
+lean_ctor_set(x_52, 5, x_42);
+lean_ctor_set(x_52, 6, x_43);
+lean_ctor_set(x_52, 7, x_44);
+lean_ctor_set(x_52, 8, x_45);
+lean_ctor_set(x_52, 9, x_46);
+lean_ctor_set(x_52, 10, x_47);
+lean_ctor_set(x_52, 11, x_48);
+lean_ctor_set_uint8(x_52, sizeof(void*)*12, x_2);
+lean_ctor_set_uint8(x_52, sizeof(void*)*12 + 1, x_49);
+x_53 = 0;
 lean_inc(x_10);
-lean_inc(x_50);
+lean_inc(x_52);
 lean_inc(x_5);
 lean_inc(x_4);
-x_52 = l_Lean_Meta_withNewMCtxDepth___at_Lean_Meta_matchesInstance___spec__1___rarg(x_3, x_51, x_4, x_5, x_50, x_10, x_11);
-if (lean_obj_tag(x_52) == 0)
+x_54 = l_Lean_Meta_withNewMCtxDepth___at_Lean_Meta_matchesInstance___spec__1___rarg(x_3, x_53, x_4, x_5, x_52, x_10, x_11);
+if (lean_obj_tag(x_54) == 0)
 {
-lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; 
-x_53 = lean_ctor_get(x_52, 0);
-lean_inc(x_53);
-x_54 = lean_ctor_get(x_52, 1);
-lean_inc(x_54);
-lean_dec(x_52);
-x_55 = lean_box(0);
-x_56 = lean_array_get_size(x_53);
-x_57 = lean_unsigned_to_nat(0u);
-x_58 = lean_unsigned_to_nat(1u);
-x_59 = l_Lean_Elab_WF_instInhabitedEqnInfo___closed__3;
+lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; 
+x_55 = lean_ctor_get(x_54, 0);
+lean_inc(x_55);
+x_56 = lean_ctor_get(x_54, 1);
 lean_inc(x_56);
-x_60 = l_Std_Range_forIn_loop___at_Lean_Elab_WF_mkEqns___spec__1(x_6, x_7, x_53, x_55, x_56, x_56, x_57, x_56, x_58, x_59, x_4, x_5, x_50, x_10, x_54);
-lean_dec(x_56);
-lean_dec(x_53);
-if (lean_obj_tag(x_60) == 0)
+lean_dec(x_54);
+x_57 = lean_box(0);
+x_58 = lean_array_get_size(x_55);
+x_59 = lean_unsigned_to_nat(0u);
+x_60 = lean_unsigned_to_nat(1u);
+x_61 = l_Lean_Elab_WF_instInhabitedEqnInfo___closed__3;
+lean_inc(x_58);
+x_62 = l_Std_Range_forIn_loop___at_Lean_Elab_WF_mkEqns___spec__1(x_6, x_7, x_55, x_57, x_58, x_58, x_59, x_58, x_60, x_61, x_4, x_5, x_52, x_10, x_56);
+lean_dec(x_58);
+lean_dec(x_55);
+if (lean_obj_tag(x_62) == 0)
 {
-lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; 
-x_61 = lean_ctor_get(x_60, 0);
-lean_inc(x_61);
-x_62 = lean_ctor_get(x_60, 1);
-lean_inc(x_62);
-if (lean_is_exclusive(x_60)) {
- lean_ctor_release(x_60, 0);
- lean_ctor_release(x_60, 1);
- x_63 = x_60;
+lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; 
+x_63 = lean_ctor_get(x_62, 0);
+lean_inc(x_63);
+x_64 = lean_ctor_get(x_62, 1);
+lean_inc(x_64);
+if (lean_is_exclusive(x_62)) {
+ lean_ctor_release(x_62, 0);
+ lean_ctor_release(x_62, 1);
+ x_65 = x_62;
 } else {
- lean_dec_ref(x_60);
- x_63 = lean_box(0);
+ lean_dec_ref(x_62);
+ x_65 = lean_box(0);
 }
-if (lean_is_scalar(x_63)) {
- x_64 = lean_alloc_ctor(0, 2, 0);
+if (lean_is_scalar(x_65)) {
+ x_66 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_64 = x_63;
+ x_66 = x_65;
 }
-lean_ctor_set(x_64, 0, x_61);
-lean_ctor_set(x_64, 1, x_62);
-return x_64;
+lean_ctor_set(x_66, 0, x_63);
+lean_ctor_set(x_66, 1, x_64);
+return x_66;
 }
 else
 {
-lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; 
-x_65 = lean_ctor_get(x_60, 0);
-lean_inc(x_65);
-x_66 = lean_ctor_get(x_60, 1);
-lean_inc(x_66);
-if (lean_is_exclusive(x_60)) {
- lean_ctor_release(x_60, 0);
- lean_ctor_release(x_60, 1);
- x_67 = x_60;
+lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; 
+x_67 = lean_ctor_get(x_62, 0);
+lean_inc(x_67);
+x_68 = lean_ctor_get(x_62, 1);
+lean_inc(x_68);
+if (lean_is_exclusive(x_62)) {
+ lean_ctor_release(x_62, 0);
+ lean_ctor_release(x_62, 1);
+ x_69 = x_62;
 } else {
- lean_dec_ref(x_60);
- x_67 = lean_box(0);
+ lean_dec_ref(x_62);
+ x_69 = lean_box(0);
 }
-if (lean_is_scalar(x_67)) {
- x_68 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_69)) {
+ x_70 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_68 = x_67;
+ x_70 = x_69;
 }
-lean_ctor_set(x_68, 0, x_65);
-lean_ctor_set(x_68, 1, x_66);
-return x_68;
+lean_ctor_set(x_70, 0, x_67);
+lean_ctor_set(x_70, 1, x_68);
+return x_70;
 }
 }
 else
 {
-lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; 
-lean_dec(x_50);
+lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; 
+lean_dec(x_52);
 lean_dec(x_10);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-x_69 = lean_ctor_get(x_52, 0);
-lean_inc(x_69);
-x_70 = lean_ctor_get(x_52, 1);
-lean_inc(x_70);
-if (lean_is_exclusive(x_52)) {
- lean_ctor_release(x_52, 0);
- lean_ctor_release(x_52, 1);
- x_71 = x_52;
+x_71 = lean_ctor_get(x_54, 0);
+lean_inc(x_71);
+x_72 = lean_ctor_get(x_54, 1);
+lean_inc(x_72);
+if (lean_is_exclusive(x_54)) {
+ lean_ctor_release(x_54, 0);
+ lean_ctor_release(x_54, 1);
+ x_73 = x_54;
 } else {
- lean_dec_ref(x_52);
- x_71 = lean_box(0);
+ lean_dec_ref(x_54);
+ x_73 = lean_box(0);
 }
-if (lean_is_scalar(x_71)) {
- x_72 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_73)) {
+ x_74 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_72 = x_71;
+ x_74 = x_73;
 }
-lean_ctor_set(x_72, 0, x_69);
-lean_ctor_set(x_72, 1, x_70);
-return x_72;
+lean_ctor_set(x_74, 0, x_71);
+lean_ctor_set(x_74, 1, x_72);
+return x_74;
 }
 }
 }

stage0/stdlib/Lean/Elab/PreDefinition/WF/Fix.c

@@ -8444,7 +8444,7 @@ return x_145;
 }
 else
 {
-lean_object* x_146; lean_object* x_147; lean_object* x_148; lean_object* x_149; lean_object* x_150; lean_object* x_151; lean_object* x_152; lean_object* x_153; lean_object* x_154; lean_object* x_155; lean_object* x_156; lean_object* x_157; lean_object* x_158; uint8_t x_159; lean_object* x_160; lean_object* x_161; 
+lean_object* x_146; lean_object* x_147; lean_object* x_148; lean_object* x_149; lean_object* x_150; lean_object* x_151; lean_object* x_152; lean_object* x_153; lean_object* x_154; lean_object* x_155; lean_object* x_156; lean_object* x_157; lean_object* x_158; uint8_t x_159; lean_object* x_160; uint8_t x_161; lean_object* x_162; lean_object* x_163; 
 lean_dec(x_131);
 x_146 = lean_ctor_get(x_133, 0);
 lean_inc(x_146);
@@ -8474,98 +8474,103 @@ x_157 = lean_ctor_get(x_11, 9);
 lean_inc(x_157);
 x_158 = lean_ctor_get(x_11, 10);
 lean_inc(x_158);
-x_159 = lean_ctor_get_uint8(x_11, sizeof(void*)*11);
+x_159 = lean_ctor_get_uint8(x_11, sizeof(void*)*12);
+x_160 = lean_ctor_get(x_11, 11);
+lean_inc(x_160);
+x_161 = lean_ctor_get_uint8(x_11, sizeof(void*)*12 + 1);
 lean_dec(x_11);
-x_160 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_160, 0, x_149);
-lean_ctor_set(x_160, 1, x_150);
-lean_ctor_set(x_160, 2, x_151);
-lean_ctor_set(x_160, 3, x_152);
-lean_ctor_set(x_160, 4, x_153);
-lean_ctor_set(x_160, 5, x_148);
-lean_ctor_set(x_160, 6, x_154);
-lean_ctor_set(x_160, 7, x_155);
-lean_ctor_set(x_160, 8, x_156);
-lean_ctor_set(x_160, 9, x_157);
-lean_ctor_set(x_160, 10, x_158);
-lean_ctor_set_uint8(x_160, sizeof(void*)*11, x_159);
-x_161 = l___private_Lean_Elab_PreDefinition_WF_Fix_0__Lean_Elab_WF_replaceRecApps_loop(x_2, x_3, x_4, x_132, x_6, x_7, x_8, x_9, x_10, x_160, x_12, x_13);
-return x_161;
+x_162 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_162, 0, x_149);
+lean_ctor_set(x_162, 1, x_150);
+lean_ctor_set(x_162, 2, x_151);
+lean_ctor_set(x_162, 3, x_152);
+lean_ctor_set(x_162, 4, x_153);
+lean_ctor_set(x_162, 5, x_148);
+lean_ctor_set(x_162, 6, x_154);
+lean_ctor_set(x_162, 7, x_155);
+lean_ctor_set(x_162, 8, x_156);
+lean_ctor_set(x_162, 9, x_157);
+lean_ctor_set(x_162, 10, x_158);
+lean_ctor_set(x_162, 11, x_160);
+lean_ctor_set_uint8(x_162, sizeof(void*)*12, x_159);
+lean_ctor_set_uint8(x_162, sizeof(void*)*12 + 1, x_161);
+x_163 = l___private_Lean_Elab_PreDefinition_WF_Fix_0__Lean_Elab_WF_replaceRecApps_loop(x_2, x_3, x_4, x_132, x_6, x_7, x_8, x_9, x_10, x_162, x_12, x_13);
+return x_163;
 }
 }
 case 11:
 {
-lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; 
-x_162 = lean_ctor_get(x_1, 0);
-lean_inc(x_162);
-x_163 = lean_ctor_get(x_1, 1);
-lean_inc(x_163);
-x_164 = lean_ctor_get(x_1, 2);
+lean_object* x_164; lean_object* x_165; lean_object* x_166; lean_object* x_167; 
+x_164 = lean_ctor_get(x_1, 0);
 lean_inc(x_164);
+x_165 = lean_ctor_get(x_1, 1);
+lean_inc(x_165);
+x_166 = lean_ctor_get(x_1, 2);
+lean_inc(x_166);
 lean_dec(x_1);
-x_165 = l___private_Lean_Elab_PreDefinition_WF_Fix_0__Lean_Elab_WF_replaceRecApps_loop(x_2, x_3, x_4, x_164, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-if (lean_obj_tag(x_165) == 0)
+x_167 = l___private_Lean_Elab_PreDefinition_WF_Fix_0__Lean_Elab_WF_replaceRecApps_loop(x_2, x_3, x_4, x_166, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+if (lean_obj_tag(x_167) == 0)
 {
-uint8_t x_166; 
-x_166 = !lean_is_exclusive(x_165);
-if (x_166 == 0)
+uint8_t x_168; 
+x_168 = !lean_is_exclusive(x_167);
+if (x_168 == 0)
 {
-lean_object* x_167; lean_object* x_168; 
-x_167 = lean_ctor_get(x_165, 0);
-x_168 = l_Lean_Expr_proj___override(x_162, x_163, x_167);
-lean_ctor_set(x_165, 0, x_168);
-return x_165;
+lean_object* x_169; lean_object* x_170; 
+x_169 = lean_ctor_get(x_167, 0);
+x_170 = l_Lean_Expr_proj___override(x_164, x_165, x_169);
+lean_ctor_set(x_167, 0, x_170);
+return x_167;
 }
 else
 {
-lean_object* x_169; lean_object* x_170; lean_object* x_171; lean_object* x_172; 
-x_169 = lean_ctor_get(x_165, 0);
-x_170 = lean_ctor_get(x_165, 1);
-lean_inc(x_170);
-lean_inc(x_169);
+lean_object* x_171; lean_object* x_172; lean_object* x_173; lean_object* x_174; 
+x_171 = lean_ctor_get(x_167, 0);
+x_172 = lean_ctor_get(x_167, 1);
+lean_inc(x_172);
+lean_inc(x_171);
+lean_dec(x_167);
+x_173 = l_Lean_Expr_proj___override(x_164, x_165, x_171);
+x_174 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_174, 0, x_173);
+lean_ctor_set(x_174, 1, x_172);
+return x_174;
+}
+}
+else
+{
+uint8_t x_175; 
 lean_dec(x_165);
-x_171 = l_Lean_Expr_proj___override(x_162, x_163, x_169);
-x_172 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_172, 0, x_171);
-lean_ctor_set(x_172, 1, x_170);
-return x_172;
-}
+lean_dec(x_164);
+x_175 = !lean_is_exclusive(x_167);
+if (x_175 == 0)
+{
+return x_167;
 }
 else
 {
-uint8_t x_173; 
-lean_dec(x_163);
-lean_dec(x_162);
-x_173 = !lean_is_exclusive(x_165);
-if (x_173 == 0)
-{
-return x_165;
-}
-else
-{
-lean_object* x_174; lean_object* x_175; lean_object* x_176; 
-x_174 = lean_ctor_get(x_165, 0);
-x_175 = lean_ctor_get(x_165, 1);
-lean_inc(x_175);
-lean_inc(x_174);
-lean_dec(x_165);
-x_176 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_176, 0, x_174);
-lean_ctor_set(x_176, 1, x_175);
-return x_176;
+lean_object* x_176; lean_object* x_177; lean_object* x_178; 
+x_176 = lean_ctor_get(x_167, 0);
+x_177 = lean_ctor_get(x_167, 1);
+lean_inc(x_177);
+lean_inc(x_176);
+lean_dec(x_167);
+x_178 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_178, 0, x_176);
+lean_ctor_set(x_178, 1, x_177);
+return x_178;
 }
 }
 }
 default: 
 {
-lean_object* x_177; 
+lean_object* x_179; 
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_4);
 lean_dec(x_3);
-x_177 = l_Lean_Elab_ensureNoRecFn(x_2, x_1, x_9, x_10, x_11, x_12, x_13);
-return x_177;
+x_179 = l_Lean_Elab_ensureNoRecFn(x_2, x_1, x_9, x_10, x_11, x_12, x_13);
+return x_179;
 }
 }
 }
@@ -14143,7 +14148,7 @@ return x_38;
 }
 else
 {
-lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; uint8_t x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; 
+lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; uint8_t x_51; lean_object* x_52; uint8_t x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; 
 lean_dec(x_23);
 x_39 = lean_ctor_get(x_28, 0);
 lean_inc(x_39);
@@ -14159,9 +14164,12 @@ x_47 = lean_ctor_get(x_9, 7);
 x_48 = lean_ctor_get(x_9, 8);
 x_49 = lean_ctor_get(x_9, 9);
 x_50 = lean_ctor_get(x_9, 10);
-x_51 = lean_ctor_get_uint8(x_9, sizeof(void*)*11);
-x_52 = l_Lean_replaceRef(x_39, x_45);
+x_51 = lean_ctor_get_uint8(x_9, sizeof(void*)*12);
+x_52 = lean_ctor_get(x_9, 11);
+x_53 = lean_ctor_get_uint8(x_9, sizeof(void*)*12 + 1);
+x_54 = l_Lean_replaceRef(x_39, x_45);
 lean_dec(x_39);
+lean_inc(x_52);
 lean_inc(x_50);
 lean_inc(x_49);
 lean_inc(x_48);
@@ -14172,68 +14180,70 @@ lean_inc(x_43);
 lean_inc(x_42);
 lean_inc(x_41);
 lean_inc(x_40);
-x_53 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_53, 0, x_40);
-lean_ctor_set(x_53, 1, x_41);
-lean_ctor_set(x_53, 2, x_42);
-lean_ctor_set(x_53, 3, x_43);
-lean_ctor_set(x_53, 4, x_44);
-lean_ctor_set(x_53, 5, x_52);
-lean_ctor_set(x_53, 6, x_46);
-lean_ctor_set(x_53, 7, x_47);
-lean_ctor_set(x_53, 8, x_48);
-lean_ctor_set(x_53, 9, x_49);
-lean_ctor_set(x_53, 10, x_50);
-lean_ctor_set_uint8(x_53, sizeof(void*)*11, x_51);
+x_55 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_55, 0, x_40);
+lean_ctor_set(x_55, 1, x_41);
+lean_ctor_set(x_55, 2, x_42);
+lean_ctor_set(x_55, 3, x_43);
+lean_ctor_set(x_55, 4, x_44);
+lean_ctor_set(x_55, 5, x_54);
+lean_ctor_set(x_55, 6, x_46);
+lean_ctor_set(x_55, 7, x_47);
+lean_ctor_set(x_55, 8, x_48);
+lean_ctor_set(x_55, 9, x_49);
+lean_ctor_set(x_55, 10, x_50);
+lean_ctor_set(x_55, 11, x_52);
+lean_ctor_set_uint8(x_55, sizeof(void*)*12, x_51);
+lean_ctor_set_uint8(x_55, sizeof(void*)*12 + 1, x_53);
 lean_inc(x_10);
 lean_inc(x_8);
 lean_inc(x_7);
 lean_inc(x_6);
 lean_inc(x_5);
-x_54 = l___private_Lean_Elab_PreDefinition_WF_Fix_0__Lean_Elab_WF_applyDefaultDecrTactic(x_14, x_5, x_6, x_7, x_8, x_53, x_10, x_27);
-if (lean_obj_tag(x_54) == 0)
+x_56 = l___private_Lean_Elab_PreDefinition_WF_Fix_0__Lean_Elab_WF_applyDefaultDecrTactic(x_14, x_5, x_6, x_7, x_8, x_55, x_10, x_27);
+if (lean_obj_tag(x_56) == 0)
 {
-lean_object* x_55; lean_object* x_56; 
-x_55 = lean_ctor_get(x_54, 1);
-lean_inc(x_55);
-lean_dec(x_54);
-x_56 = l_Array_forInUnsafe_loop___at_Lean_Elab_WF_solveDecreasingGoals___spec__1___closed__3;
-x_15 = x_56;
-x_16 = x_55;
+lean_object* x_57; lean_object* x_58; 
+x_57 = lean_ctor_get(x_56, 1);
+lean_inc(x_57);
+lean_dec(x_56);
+x_58 = l_Array_forInUnsafe_loop___at_Lean_Elab_WF_solveDecreasingGoals___spec__1___closed__3;
+x_15 = x_58;
+x_16 = x_57;
 goto block_21;
 }
 else
 {
-uint8_t x_57; 
+uint8_t x_59; 
 lean_dec(x_10);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
-x_57 = !lean_is_exclusive(x_54);
-if (x_57 == 0)
+x_59 = !lean_is_exclusive(x_56);
+if (x_59 == 0)
 {
-return x_54;
+return x_56;
 }
 else
 {
-lean_object* x_58; lean_object* x_59; lean_object* x_60; 
-x_58 = lean_ctor_get(x_54, 0);
-x_59 = lean_ctor_get(x_54, 1);
-lean_inc(x_59);
-lean_inc(x_58);
-lean_dec(x_54);
-x_60 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_60, 0, x_58);
-lean_ctor_set(x_60, 1, x_59);
-return x_60;
+lean_object* x_60; lean_object* x_61; lean_object* x_62; 
+x_60 = lean_ctor_get(x_56, 0);
+x_61 = lean_ctor_get(x_56, 1);
+lean_inc(x_61);
+lean_inc(x_60);
+lean_dec(x_56);
+x_62 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_62, 0, x_60);
+lean_ctor_set(x_62, 1, x_61);
+return x_62;
 }
 }
 }
 }
 else
 {
-uint8_t x_61; 
+uint8_t x_63; 
 lean_dec(x_23);
 lean_dec(x_14);
 lean_dec(x_10);
@@ -14241,52 +14251,52 @@ lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
-x_61 = !lean_is_exclusive(x_25);
-if (x_61 == 0)
+x_63 = !lean_is_exclusive(x_25);
+if (x_63 == 0)
 {
 return x_25;
 }
 else
 {
-lean_object* x_62; lean_object* x_63; lean_object* x_64; 
-x_62 = lean_ctor_get(x_25, 0);
-x_63 = lean_ctor_get(x_25, 1);
-lean_inc(x_63);
-lean_inc(x_62);
+lean_object* x_64; lean_object* x_65; lean_object* x_66; 
+x_64 = lean_ctor_get(x_25, 0);
+x_65 = lean_ctor_get(x_25, 1);
+lean_inc(x_65);
+lean_inc(x_64);
 lean_dec(x_25);
-x_64 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_64, 0, x_62);
-lean_ctor_set(x_64, 1, x_63);
-return x_64;
+x_66 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_66, 0, x_64);
+lean_ctor_set(x_66, 1, x_65);
+return x_66;
 }
 }
 }
 else
 {
-uint8_t x_65; 
+uint8_t x_67; 
 lean_dec(x_14);
 lean_dec(x_10);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
-x_65 = !lean_is_exclusive(x_22);
-if (x_65 == 0)
+x_67 = !lean_is_exclusive(x_22);
+if (x_67 == 0)
 {
 return x_22;
 }
 else
 {
-lean_object* x_66; lean_object* x_67; lean_object* x_68; 
-x_66 = lean_ctor_get(x_22, 0);
-x_67 = lean_ctor_get(x_22, 1);
-lean_inc(x_67);
-lean_inc(x_66);
+lean_object* x_68; lean_object* x_69; lean_object* x_70; 
+x_68 = lean_ctor_get(x_22, 0);
+x_69 = lean_ctor_get(x_22, 1);
+lean_inc(x_69);
+lean_inc(x_68);
 lean_dec(x_22);
-x_68 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_68, 0, x_66);
-lean_ctor_set(x_68, 1, x_67);
-return x_68;
+x_70 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_70, 0, x_68);
+lean_ctor_set(x_70, 1, x_69);
+return x_70;
 }
 }
 block_21:
@@ -14746,7 +14756,7 @@ return x_57;
 }
 else
 {
-lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; uint8_t x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; uint8_t x_81; lean_object* x_82; 
+lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; uint8_t x_76; lean_object* x_77; uint8_t x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; uint8_t x_83; lean_object* x_84; 
 x_65 = lean_ctor_get(x_9, 0);
 x_66 = lean_ctor_get(x_9, 1);
 x_67 = lean_ctor_get(x_9, 2);
@@ -14758,7 +14768,10 @@ x_72 = lean_ctor_get(x_9, 7);
 x_73 = lean_ctor_get(x_9, 8);
 x_74 = lean_ctor_get(x_9, 9);
 x_75 = lean_ctor_get(x_9, 10);
-x_76 = lean_ctor_get_uint8(x_9, sizeof(void*)*11);
+x_76 = lean_ctor_get_uint8(x_9, sizeof(void*)*12);
+x_77 = lean_ctor_get(x_9, 11);
+x_78 = lean_ctor_get_uint8(x_9, sizeof(void*)*12 + 1);
+lean_inc(x_77);
 lean_inc(x_75);
 lean_inc(x_74);
 lean_inc(x_73);
@@ -14771,225 +14784,227 @@ lean_inc(x_67);
 lean_inc(x_66);
 lean_inc(x_65);
 lean_dec(x_9);
-x_77 = l_Lean_replaceRef(x_2, x_70);
+x_79 = l_Lean_replaceRef(x_2, x_70);
 lean_dec(x_70);
-x_78 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_78, 0, x_65);
-lean_ctor_set(x_78, 1, x_66);
-lean_ctor_set(x_78, 2, x_67);
-lean_ctor_set(x_78, 3, x_68);
-lean_ctor_set(x_78, 4, x_69);
-lean_ctor_set(x_78, 5, x_77);
-lean_ctor_set(x_78, 6, x_71);
-lean_ctor_set(x_78, 7, x_72);
-lean_ctor_set(x_78, 8, x_73);
-lean_ctor_set(x_78, 9, x_74);
-lean_ctor_set(x_78, 10, x_75);
-lean_ctor_set_uint8(x_78, sizeof(void*)*11, x_76);
-x_79 = lean_array_get_size(x_3);
-x_80 = lean_unsigned_to_nat(0u);
-x_81 = lean_nat_dec_lt(x_80, x_79);
-if (x_81 == 0)
+x_80 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_80, 0, x_65);
+lean_ctor_set(x_80, 1, x_66);
+lean_ctor_set(x_80, 2, x_67);
+lean_ctor_set(x_80, 3, x_68);
+lean_ctor_set(x_80, 4, x_69);
+lean_ctor_set(x_80, 5, x_79);
+lean_ctor_set(x_80, 6, x_71);
+lean_ctor_set(x_80, 7, x_72);
+lean_ctor_set(x_80, 8, x_73);
+lean_ctor_set(x_80, 9, x_74);
+lean_ctor_set(x_80, 10, x_75);
+lean_ctor_set(x_80, 11, x_77);
+lean_ctor_set_uint8(x_80, sizeof(void*)*12, x_76);
+lean_ctor_set_uint8(x_80, sizeof(void*)*12 + 1, x_78);
+x_81 = lean_array_get_size(x_3);
+x_82 = lean_unsigned_to_nat(0u);
+x_83 = lean_nat_dec_lt(x_82, x_81);
+if (x_83 == 0)
 {
-lean_dec(x_79);
-x_82 = x_11;
-goto block_112;
+lean_dec(x_81);
+x_84 = x_11;
+goto block_114;
 }
 else
 {
-uint8_t x_113; 
-x_113 = lean_nat_dec_le(x_79, x_79);
-if (x_113 == 0)
+uint8_t x_115; 
+x_115 = lean_nat_dec_le(x_81, x_81);
+if (x_115 == 0)
 {
-lean_dec(x_79);
-x_82 = x_11;
-goto block_112;
+lean_dec(x_81);
+x_84 = x_11;
+goto block_114;
 }
 else
 {
-size_t x_114; size_t x_115; lean_object* x_116; lean_object* x_117; lean_object* x_118; 
-x_114 = 0;
-x_115 = lean_usize_of_nat(x_79);
-lean_dec(x_79);
-x_116 = lean_box(0);
-x_117 = l_Array_foldlMUnsafe_fold___at_Lean_Elab_WF_solveDecreasingGoals___spec__2(x_3, x_114, x_115, x_116, x_5, x_6, x_7, x_8, x_78, x_10, x_11);
-x_118 = lean_ctor_get(x_117, 1);
-lean_inc(x_118);
-lean_dec(x_117);
-x_82 = x_118;
-goto block_112;
+size_t x_116; size_t x_117; lean_object* x_118; lean_object* x_119; lean_object* x_120; 
+x_116 = 0;
+x_117 = lean_usize_of_nat(x_81);
+lean_dec(x_81);
+x_118 = lean_box(0);
+x_119 = l_Array_foldlMUnsafe_fold___at_Lean_Elab_WF_solveDecreasingGoals___spec__2(x_3, x_116, x_117, x_118, x_5, x_6, x_7, x_8, x_80, x_10, x_11);
+x_120 = lean_ctor_get(x_119, 1);
+lean_inc(x_120);
+lean_dec(x_119);
+x_84 = x_120;
+goto block_114;
 }
 }
-block_112:
+block_114:
 {
-lean_object* x_83; lean_object* x_84; 
+lean_object* x_85; lean_object* x_86; 
 lean_inc(x_3);
-x_83 = lean_array_to_list(lean_box(0), x_3);
-x_84 = lean_alloc_closure((void*)(l_Array_forInUnsafe_loop___at_Lean_Elab_WF_solveDecreasingGoals___spec__3___lambda__4), 12, 3);
-lean_closure_set(x_84, 0, x_83);
-lean_closure_set(x_84, 1, x_4);
-lean_closure_set(x_84, 2, x_2);
-if (x_81 == 0)
+x_85 = lean_array_to_list(lean_box(0), x_3);
+x_86 = lean_alloc_closure((void*)(l_Array_forInUnsafe_loop___at_Lean_Elab_WF_solveDecreasingGoals___spec__3___lambda__4), 12, 3);
+lean_closure_set(x_86, 0, x_85);
+lean_closure_set(x_86, 1, x_4);
+lean_closure_set(x_86, 2, x_2);
+if (x_83 == 0)
 {
-lean_object* x_85; lean_object* x_86; lean_object* x_87; 
+lean_object* x_87; lean_object* x_88; lean_object* x_89; 
 lean_dec(x_3);
-x_85 = l_Lean_instInhabitedMVarId;
-x_86 = l___private_Init_GetElem_0__outOfBounds___rarg(x_85);
+x_87 = l_Lean_instInhabitedMVarId;
+x_88 = l___private_Init_GetElem_0__outOfBounds___rarg(x_87);
 lean_inc(x_10);
-lean_inc(x_78);
+lean_inc(x_80);
 lean_inc(x_8);
 lean_inc(x_7);
-x_87 = l_Lean_Elab_Tactic_run(x_86, x_84, x_5, x_6, x_7, x_8, x_78, x_10, x_82);
-if (lean_obj_tag(x_87) == 0)
+x_89 = l_Lean_Elab_Tactic_run(x_88, x_86, x_5, x_6, x_7, x_8, x_80, x_10, x_84);
+if (lean_obj_tag(x_89) == 0)
 {
-lean_object* x_88; lean_object* x_89; lean_object* x_90; uint8_t x_91; 
-x_88 = lean_ctor_get(x_87, 0);
-lean_inc(x_88);
-x_89 = lean_ctor_get(x_87, 1);
-lean_inc(x_89);
-if (lean_is_exclusive(x_87)) {
- lean_ctor_release(x_87, 0);
- lean_ctor_release(x_87, 1);
- x_90 = x_87;
+lean_object* x_90; lean_object* x_91; lean_object* x_92; uint8_t x_93; 
+x_90 = lean_ctor_get(x_89, 0);
+lean_inc(x_90);
+x_91 = lean_ctor_get(x_89, 1);
+lean_inc(x_91);
+if (lean_is_exclusive(x_89)) {
+ lean_ctor_release(x_89, 0);
+ lean_ctor_release(x_89, 1);
+ x_92 = x_89;
 } else {
- lean_dec_ref(x_87);
- x_90 = lean_box(0);
+ lean_dec_ref(x_89);
+ x_92 = lean_box(0);
 }
-x_91 = l_List_isEmpty___rarg(x_88);
-if (x_91 == 0)
+x_93 = l_List_isEmpty___rarg(x_90);
+if (x_93 == 0)
 {
-lean_object* x_92; 
-lean_dec(x_90);
-x_92 = l_Lean_Elab_Term_reportUnsolvedGoals(x_88, x_7, x_8, x_78, x_10, x_89);
-return x_92;
-}
-else
-{
-lean_object* x_93; lean_object* x_94; 
-lean_dec(x_88);
-lean_dec(x_78);
-lean_dec(x_10);
-lean_dec(x_8);
-lean_dec(x_7);
-x_93 = lean_box(0);
-if (lean_is_scalar(x_90)) {
- x_94 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_94 = x_90;
-}
-lean_ctor_set(x_94, 0, x_93);
-lean_ctor_set(x_94, 1, x_89);
+lean_object* x_94; 
+lean_dec(x_92);
+x_94 = l_Lean_Elab_Term_reportUnsolvedGoals(x_90, x_7, x_8, x_80, x_10, x_91);
 return x_94;
 }
-}
 else
 {
-lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; 
-lean_dec(x_78);
+lean_object* x_95; lean_object* x_96; 
+lean_dec(x_90);
+lean_dec(x_80);
 lean_dec(x_10);
 lean_dec(x_8);
 lean_dec(x_7);
-x_95 = lean_ctor_get(x_87, 0);
-lean_inc(x_95);
-x_96 = lean_ctor_get(x_87, 1);
-lean_inc(x_96);
-if (lean_is_exclusive(x_87)) {
- lean_ctor_release(x_87, 0);
- lean_ctor_release(x_87, 1);
- x_97 = x_87;
+x_95 = lean_box(0);
+if (lean_is_scalar(x_92)) {
+ x_96 = lean_alloc_ctor(0, 2, 0);
 } else {
- lean_dec_ref(x_87);
- x_97 = lean_box(0);
+ x_96 = x_92;
 }
-if (lean_is_scalar(x_97)) {
- x_98 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_98 = x_97;
-}
-lean_ctor_set(x_98, 0, x_95);
-lean_ctor_set(x_98, 1, x_96);
-return x_98;
+lean_ctor_set(x_96, 0, x_95);
+lean_ctor_set(x_96, 1, x_91);
+return x_96;
 }
 }
 else
 {
-lean_object* x_99; lean_object* x_100; 
-x_99 = lean_array_fget(x_3, x_80);
+lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; 
+lean_dec(x_80);
+lean_dec(x_10);
+lean_dec(x_8);
+lean_dec(x_7);
+x_97 = lean_ctor_get(x_89, 0);
+lean_inc(x_97);
+x_98 = lean_ctor_get(x_89, 1);
+lean_inc(x_98);
+if (lean_is_exclusive(x_89)) {
+ lean_ctor_release(x_89, 0);
+ lean_ctor_release(x_89, 1);
+ x_99 = x_89;
+} else {
+ lean_dec_ref(x_89);
+ x_99 = lean_box(0);
+}
+if (lean_is_scalar(x_99)) {
+ x_100 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_100 = x_99;
+}
+lean_ctor_set(x_100, 0, x_97);
+lean_ctor_set(x_100, 1, x_98);
+return x_100;
+}
+}
+else
+{
+lean_object* x_101; lean_object* x_102; 
+x_101 = lean_array_fget(x_3, x_82);
 lean_dec(x_3);
 lean_inc(x_10);
-lean_inc(x_78);
+lean_inc(x_80);
 lean_inc(x_8);
 lean_inc(x_7);
-x_100 = l_Lean_Elab_Tactic_run(x_99, x_84, x_5, x_6, x_7, x_8, x_78, x_10, x_82);
-if (lean_obj_tag(x_100) == 0)
+x_102 = l_Lean_Elab_Tactic_run(x_101, x_86, x_5, x_6, x_7, x_8, x_80, x_10, x_84);
+if (lean_obj_tag(x_102) == 0)
 {
-lean_object* x_101; lean_object* x_102; lean_object* x_103; uint8_t x_104; 
-x_101 = lean_ctor_get(x_100, 0);
-lean_inc(x_101);
-x_102 = lean_ctor_get(x_100, 1);
-lean_inc(x_102);
-if (lean_is_exclusive(x_100)) {
- lean_ctor_release(x_100, 0);
- lean_ctor_release(x_100, 1);
- x_103 = x_100;
+lean_object* x_103; lean_object* x_104; lean_object* x_105; uint8_t x_106; 
+x_103 = lean_ctor_get(x_102, 0);
+lean_inc(x_103);
+x_104 = lean_ctor_get(x_102, 1);
+lean_inc(x_104);
+if (lean_is_exclusive(x_102)) {
+ lean_ctor_release(x_102, 0);
+ lean_ctor_release(x_102, 1);
+ x_105 = x_102;
 } else {
- lean_dec_ref(x_100);
- x_103 = lean_box(0);
+ lean_dec_ref(x_102);
+ x_105 = lean_box(0);
 }
-x_104 = l_List_isEmpty___rarg(x_101);
-if (x_104 == 0)
+x_106 = l_List_isEmpty___rarg(x_103);
+if (x_106 == 0)
 {
-lean_object* x_105; 
-lean_dec(x_103);
-x_105 = l_Lean_Elab_Term_reportUnsolvedGoals(x_101, x_7, x_8, x_78, x_10, x_102);
-return x_105;
-}
-else
-{
-lean_object* x_106; lean_object* x_107; 
-lean_dec(x_101);
-lean_dec(x_78);
-lean_dec(x_10);
-lean_dec(x_8);
-lean_dec(x_7);
-x_106 = lean_box(0);
-if (lean_is_scalar(x_103)) {
- x_107 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_107 = x_103;
-}
-lean_ctor_set(x_107, 0, x_106);
-lean_ctor_set(x_107, 1, x_102);
+lean_object* x_107; 
+lean_dec(x_105);
+x_107 = l_Lean_Elab_Term_reportUnsolvedGoals(x_103, x_7, x_8, x_80, x_10, x_104);
 return x_107;
 }
-}
 else
 {
-lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; 
-lean_dec(x_78);
+lean_object* x_108; lean_object* x_109; 
+lean_dec(x_103);
+lean_dec(x_80);
 lean_dec(x_10);
 lean_dec(x_8);
 lean_dec(x_7);
-x_108 = lean_ctor_get(x_100, 0);
-lean_inc(x_108);
-x_109 = lean_ctor_get(x_100, 1);
-lean_inc(x_109);
-if (lean_is_exclusive(x_100)) {
- lean_ctor_release(x_100, 0);
- lean_ctor_release(x_100, 1);
- x_110 = x_100;
+x_108 = lean_box(0);
+if (lean_is_scalar(x_105)) {
+ x_109 = lean_alloc_ctor(0, 2, 0);
 } else {
- lean_dec_ref(x_100);
- x_110 = lean_box(0);
+ x_109 = x_105;
 }
-if (lean_is_scalar(x_110)) {
- x_111 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_109, 0, x_108);
+lean_ctor_set(x_109, 1, x_104);
+return x_109;
+}
+}
+else
+{
+lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; 
+lean_dec(x_80);
+lean_dec(x_10);
+lean_dec(x_8);
+lean_dec(x_7);
+x_110 = lean_ctor_get(x_102, 0);
+lean_inc(x_110);
+x_111 = lean_ctor_get(x_102, 1);
+lean_inc(x_111);
+if (lean_is_exclusive(x_102)) {
+ lean_ctor_release(x_102, 0);
+ lean_ctor_release(x_102, 1);
+ x_112 = x_102;
 } else {
- x_111 = x_110;
+ lean_dec_ref(x_102);
+ x_112 = lean_box(0);
 }
-lean_ctor_set(x_111, 0, x_108);
-lean_ctor_set(x_111, 1, x_109);
-return x_111;
+if (lean_is_scalar(x_112)) {
+ x_113 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_113 = x_112;
+}
+lean_ctor_set(x_113, 0, x_110);
+lean_ctor_set(x_113, 1, x_111);
+return x_113;
 }
 }
 }
@@ -14997,7 +15012,7 @@ return x_111;
 }
 else
 {
-lean_object* x_119; lean_object* x_120; 
+lean_object* x_121; lean_object* x_122; 
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
@@ -15007,11 +15022,11 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_119 = lean_box(0);
-x_120 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_120, 0, x_119);
-lean_ctor_set(x_120, 1, x_11);
-return x_120;
+x_121 = lean_box(0);
+x_122 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_122, 0, x_121);
+lean_ctor_set(x_122, 1, x_11);
+return x_122;
 }
 }
 }
@@ -15070,7 +15085,7 @@ x_4 = 1;
 x_5 = 0;
 x_6 = l_Array_forInUnsafe_loop___at_Lean_Elab_WF_solveDecreasingGoals___spec__3___closed__3;
 x_7 = l_Array_forInUnsafe_loop___at_Lean_Elab_WF_solveDecreasingGoals___spec__3___closed__4;
-x_8 = lean_alloc_ctor(0, 8, 10);
+x_8 = lean_alloc_ctor(0, 9, 10);
 lean_ctor_set(x_8, 0, x_1);
 lean_ctor_set(x_8, 1, x_2);
 lean_ctor_set(x_8, 2, x_3);
@@ -15079,16 +15094,17 @@ lean_ctor_set(x_8, 4, x_7);
 lean_ctor_set(x_8, 5, x_2);
 lean_ctor_set(x_8, 6, x_2);
 lean_ctor_set(x_8, 7, x_1);
-lean_ctor_set_uint8(x_8, sizeof(void*)*8, x_4);
-lean_ctor_set_uint8(x_8, sizeof(void*)*8 + 1, x_4);
-lean_ctor_set_uint8(x_8, sizeof(void*)*8 + 2, x_5);
-lean_ctor_set_uint8(x_8, sizeof(void*)*8 + 3, x_4);
-lean_ctor_set_uint8(x_8, sizeof(void*)*8 + 4, x_4);
-lean_ctor_set_uint8(x_8, sizeof(void*)*8 + 5, x_5);
-lean_ctor_set_uint8(x_8, sizeof(void*)*8 + 6, x_5);
-lean_ctor_set_uint8(x_8, sizeof(void*)*8 + 7, x_5);
-lean_ctor_set_uint8(x_8, sizeof(void*)*8 + 8, x_4);
-lean_ctor_set_uint8(x_8, sizeof(void*)*8 + 9, x_5);
+lean_ctor_set(x_8, 8, x_1);
+lean_ctor_set_uint8(x_8, sizeof(void*)*9, x_4);
+lean_ctor_set_uint8(x_8, sizeof(void*)*9 + 1, x_4);
+lean_ctor_set_uint8(x_8, sizeof(void*)*9 + 2, x_5);
+lean_ctor_set_uint8(x_8, sizeof(void*)*9 + 3, x_4);
+lean_ctor_set_uint8(x_8, sizeof(void*)*9 + 4, x_4);
+lean_ctor_set_uint8(x_8, sizeof(void*)*9 + 5, x_5);
+lean_ctor_set_uint8(x_8, sizeof(void*)*9 + 6, x_5);
+lean_ctor_set_uint8(x_8, sizeof(void*)*9 + 7, x_5);
+lean_ctor_set_uint8(x_8, sizeof(void*)*9 + 8, x_4);
+lean_ctor_set_uint8(x_8, sizeof(void*)*9 + 9, x_5);
 return x_8;
 }
 }

stage0/stdlib/Lean/Elab/PreDefinition/WF/Main.c

@@ -7294,9 +7294,13 @@ x_28 = lean_alloc_ctor(6, 2, 0);
 lean_ctor_set(x_28, 0, x_27);
 lean_ctor_set(x_28, 1, x_26);
 x_29 = 2;
+lean_inc(x_11);
 lean_inc(x_10);
+lean_inc(x_9);
+lean_inc(x_8);
+lean_inc(x_7);
+lean_inc(x_6);
 x_30 = l_Lean_logAt___at_Lean_Elab_Term_MVarErrorInfo_logError___spec__2(x_15, x_28, x_29, x_6, x_7, x_8, x_9, x_10, x_11, x_12);
-lean_dec(x_15);
 x_31 = lean_ctor_get(x_30, 0);
 lean_inc(x_31);
 x_32 = lean_ctor_get(x_30, 1);
@@ -7330,9 +7334,13 @@ x_44 = lean_alloc_ctor(6, 2, 0);
 lean_ctor_set(x_44, 0, x_43);
 lean_ctor_set(x_44, 1, x_42);
 x_45 = 2;
+lean_inc(x_11);
 lean_inc(x_10);
+lean_inc(x_9);
+lean_inc(x_8);
+lean_inc(x_7);
+lean_inc(x_6);
 x_46 = l_Lean_logAt___at_Lean_Elab_Term_MVarErrorInfo_logError___spec__2(x_15, x_44, x_45, x_6, x_7, x_8, x_9, x_10, x_11, x_12);
-lean_dec(x_15);
 x_47 = lean_ctor_get(x_46, 0);
 lean_inc(x_47);
 x_48 = lean_ctor_get(x_46, 1);
@@ -7349,7 +7357,12 @@ goto _start;
 else
 {
 lean_object* x_52; 
+lean_dec(x_11);
 lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
 x_52 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_52, 0, x_5);
 lean_ctor_set(x_52, 1, x_12);
@@ -8646,7 +8659,7 @@ x_18 = l_Lean_Elab_wfRecursion___lambda__5___closed__1;
 x_19 = l_Lean_Option_get___at_Lean_profiler_threshold_getSecs___spec__1(x_1, x_18);
 lean_ctor_set(x_12, 4, x_19);
 lean_ctor_set(x_12, 2, x_1);
-lean_ctor_set_uint8(x_12, sizeof(void*)*11, x_2);
+lean_ctor_set_uint8(x_12, sizeof(void*)*12, x_2);
 lean_inc(x_13);
 lean_inc(x_12);
 lean_inc(x_6);
@@ -8783,7 +8796,7 @@ return x_46;
 }
 else
 {
-lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; 
+lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; uint8_t x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; 
 x_47 = lean_ctor_get(x_12, 0);
 x_48 = lean_ctor_get(x_12, 1);
 x_49 = lean_ctor_get(x_12, 3);
@@ -8793,6 +8806,9 @@ x_52 = lean_ctor_get(x_12, 7);
 x_53 = lean_ctor_get(x_12, 8);
 x_54 = lean_ctor_get(x_12, 9);
 x_55 = lean_ctor_get(x_12, 10);
+x_56 = lean_ctor_get(x_12, 11);
+x_57 = lean_ctor_get_uint8(x_12, sizeof(void*)*12 + 1);
+lean_inc(x_56);
 lean_inc(x_55);
 lean_inc(x_54);
 lean_inc(x_53);
@@ -8803,128 +8819,75 @@ lean_inc(x_49);
 lean_inc(x_48);
 lean_inc(x_47);
 lean_dec(x_12);
-x_56 = l_Lean_Elab_wfRecursion___lambda__5___closed__1;
-x_57 = l_Lean_Option_get___at_Lean_profiler_threshold_getSecs___spec__1(x_1, x_56);
-x_58 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_58, 0, x_47);
-lean_ctor_set(x_58, 1, x_48);
-lean_ctor_set(x_58, 2, x_1);
-lean_ctor_set(x_58, 3, x_49);
-lean_ctor_set(x_58, 4, x_57);
-lean_ctor_set(x_58, 5, x_50);
-lean_ctor_set(x_58, 6, x_51);
-lean_ctor_set(x_58, 7, x_52);
-lean_ctor_set(x_58, 8, x_53);
-lean_ctor_set(x_58, 9, x_54);
-lean_ctor_set(x_58, 10, x_55);
-lean_ctor_set_uint8(x_58, sizeof(void*)*11, x_2);
+x_58 = l_Lean_Elab_wfRecursion___lambda__5___closed__1;
+x_59 = l_Lean_Option_get___at_Lean_profiler_threshold_getSecs___spec__1(x_1, x_58);
+x_60 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_60, 0, x_47);
+lean_ctor_set(x_60, 1, x_48);
+lean_ctor_set(x_60, 2, x_1);
+lean_ctor_set(x_60, 3, x_49);
+lean_ctor_set(x_60, 4, x_59);
+lean_ctor_set(x_60, 5, x_50);
+lean_ctor_set(x_60, 6, x_51);
+lean_ctor_set(x_60, 7, x_52);
+lean_ctor_set(x_60, 8, x_53);
+lean_ctor_set(x_60, 9, x_54);
+lean_ctor_set(x_60, 10, x_55);
+lean_ctor_set(x_60, 11, x_56);
+lean_ctor_set_uint8(x_60, sizeof(void*)*12, x_2);
+lean_ctor_set_uint8(x_60, sizeof(void*)*12 + 1, x_57);
 lean_inc(x_13);
-lean_inc(x_58);
+lean_inc(x_60);
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
-x_59 = l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_isOnlyOneUnaryDef(x_3, x_4, x_5, x_6, x_58, x_13, x_14);
-if (lean_obj_tag(x_59) == 0)
+x_61 = l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_isOnlyOneUnaryDef(x_3, x_4, x_5, x_6, x_60, x_13, x_14);
+if (lean_obj_tag(x_61) == 0)
 {
-lean_object* x_60; uint8_t x_61; 
-x_60 = lean_ctor_get(x_59, 0);
-lean_inc(x_60);
-x_61 = lean_unbox(x_60);
-lean_dec(x_60);
-if (x_61 == 0)
-{
-lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; uint8_t x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; 
-x_62 = lean_ctor_get(x_59, 1);
+lean_object* x_62; uint8_t x_63; 
+x_62 = lean_ctor_get(x_61, 0);
 lean_inc(x_62);
-lean_dec(x_59);
-x_63 = lean_ctor_get(x_7, 3);
-lean_inc(x_63);
-x_64 = lean_box(0);
-x_65 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_65, 0, x_63);
-lean_ctor_set(x_65, 1, x_64);
-x_66 = 0;
-x_67 = lean_box(x_66);
+x_63 = lean_unbox(x_62);
+lean_dec(x_62);
+if (x_63 == 0)
+{
+lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; uint8_t x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; 
+x_64 = lean_ctor_get(x_61, 1);
+lean_inc(x_64);
+lean_dec(x_61);
+x_65 = lean_ctor_get(x_7, 3);
+lean_inc(x_65);
+x_66 = lean_box(0);
+x_67 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_67, 0, x_65);
+lean_ctor_set(x_67, 1, x_66);
+x_68 = 0;
+x_69 = lean_box(x_68);
 lean_inc(x_7);
-x_68 = lean_alloc_closure((void*)(l_Lean_Elab_addNonRec___boxed), 10, 3);
-lean_closure_set(x_68, 0, x_7);
-lean_closure_set(x_68, 1, x_67);
-lean_closure_set(x_68, 2, x_65);
+x_70 = lean_alloc_closure((void*)(l_Lean_Elab_addNonRec___boxed), 10, 3);
+lean_closure_set(x_70, 0, x_7);
+lean_closure_set(x_70, 1, x_69);
+lean_closure_set(x_70, 2, x_67);
 lean_inc(x_13);
-lean_inc(x_58);
+lean_inc(x_60);
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_9);
 lean_inc(x_8);
-x_69 = l_Lean_Elab_withEnableInfoTree___at_Lean_Elab_wfRecursion___spec__6(x_66, x_68, x_8, x_9, x_5, x_6, x_58, x_13, x_62);
-if (lean_obj_tag(x_69) == 0)
+x_71 = l_Lean_Elab_withEnableInfoTree___at_Lean_Elab_wfRecursion___spec__6(x_68, x_70, x_8, x_9, x_5, x_6, x_60, x_13, x_64);
+if (lean_obj_tag(x_71) == 0)
 {
-lean_object* x_70; lean_object* x_71; 
-x_70 = lean_ctor_get(x_69, 1);
-lean_inc(x_70);
-lean_dec(x_69);
-x_71 = l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs(x_4, x_10, x_3, x_7, x_8, x_9, x_5, x_6, x_58, x_13, x_70);
-return x_71;
-}
-else
-{
-lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; 
-lean_dec(x_58);
-lean_dec(x_13);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-x_72 = lean_ctor_get(x_69, 0);
+lean_object* x_72; lean_object* x_73; 
+x_72 = lean_ctor_get(x_71, 1);
 lean_inc(x_72);
-x_73 = lean_ctor_get(x_69, 1);
-lean_inc(x_73);
-if (lean_is_exclusive(x_69)) {
- lean_ctor_release(x_69, 0);
- lean_ctor_release(x_69, 1);
- x_74 = x_69;
-} else {
- lean_dec_ref(x_69);
- x_74 = lean_box(0);
-}
-if (lean_is_scalar(x_74)) {
- x_75 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_75 = x_74;
-}
-lean_ctor_set(x_75, 0, x_72);
-lean_ctor_set(x_75, 1, x_73);
-return x_75;
-}
+lean_dec(x_71);
+x_73 = l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs(x_4, x_10, x_3, x_7, x_8, x_9, x_5, x_6, x_60, x_13, x_72);
+return x_73;
 }
 else
 {
-lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; uint8_t x_80; lean_object* x_81; 
-lean_dec(x_10);
-lean_dec(x_4);
-lean_dec(x_3);
-x_76 = lean_ctor_get(x_59, 1);
-lean_inc(x_76);
-lean_dec(x_59);
-x_77 = lean_ctor_get(x_7, 3);
-lean_inc(x_77);
-x_78 = lean_box(0);
-x_79 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_79, 0, x_77);
-lean_ctor_set(x_79, 1, x_78);
-x_80 = 0;
-x_81 = l___private_Lean_Elab_PreDefinition_Basic_0__Lean_Elab_addNonRecAux(x_7, x_80, x_79, x_80, x_8, x_9, x_5, x_6, x_58, x_13, x_76);
-return x_81;
-}
-}
-else
-{
-lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; 
-lean_dec(x_58);
+lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; 
+lean_dec(x_60);
 lean_dec(x_13);
 lean_dec(x_10);
 lean_dec(x_9);
@@ -8934,26 +8897,81 @@ lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_82 = lean_ctor_get(x_59, 0);
-lean_inc(x_82);
-x_83 = lean_ctor_get(x_59, 1);
-lean_inc(x_83);
-if (lean_is_exclusive(x_59)) {
- lean_ctor_release(x_59, 0);
- lean_ctor_release(x_59, 1);
- x_84 = x_59;
+x_74 = lean_ctor_get(x_71, 0);
+lean_inc(x_74);
+x_75 = lean_ctor_get(x_71, 1);
+lean_inc(x_75);
+if (lean_is_exclusive(x_71)) {
+ lean_ctor_release(x_71, 0);
+ lean_ctor_release(x_71, 1);
+ x_76 = x_71;
 } else {
- lean_dec_ref(x_59);
- x_84 = lean_box(0);
+ lean_dec_ref(x_71);
+ x_76 = lean_box(0);
 }
-if (lean_is_scalar(x_84)) {
- x_85 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_76)) {
+ x_77 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_85 = x_84;
+ x_77 = x_76;
 }
-lean_ctor_set(x_85, 0, x_82);
-lean_ctor_set(x_85, 1, x_83);
-return x_85;
+lean_ctor_set(x_77, 0, x_74);
+lean_ctor_set(x_77, 1, x_75);
+return x_77;
+}
+}
+else
+{
+lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; uint8_t x_82; lean_object* x_83; 
+lean_dec(x_10);
+lean_dec(x_4);
+lean_dec(x_3);
+x_78 = lean_ctor_get(x_61, 1);
+lean_inc(x_78);
+lean_dec(x_61);
+x_79 = lean_ctor_get(x_7, 3);
+lean_inc(x_79);
+x_80 = lean_box(0);
+x_81 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_81, 0, x_79);
+lean_ctor_set(x_81, 1, x_80);
+x_82 = 0;
+x_83 = l___private_Lean_Elab_PreDefinition_Basic_0__Lean_Elab_addNonRecAux(x_7, x_82, x_81, x_82, x_8, x_9, x_5, x_6, x_60, x_13, x_78);
+return x_83;
+}
+}
+else
+{
+lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; 
+lean_dec(x_60);
+lean_dec(x_13);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+x_84 = lean_ctor_get(x_61, 0);
+lean_inc(x_84);
+x_85 = lean_ctor_get(x_61, 1);
+lean_inc(x_85);
+if (lean_is_exclusive(x_61)) {
+ lean_ctor_release(x_61, 0);
+ lean_ctor_release(x_61, 1);
+ x_86 = x_61;
+} else {
+ lean_dec_ref(x_61);
+ x_86 = lean_box(0);
+}
+if (lean_is_scalar(x_86)) {
+ x_87 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_87 = x_86;
+}
+lean_ctor_set(x_87, 0, x_84);
+lean_ctor_set(x_87, 1, x_85);
+return x_87;
 }
 }
 }
@@ -10547,11 +10565,6 @@ x_38 = lean_usize_of_nat(x_30);
 lean_dec(x_30);
 x_39 = lean_box(0);
 x_40 = l_Array_foldlMUnsafe_fold___at_Lean_Elab_wfRecursion___spec__8(x_26, x_27, x_11, x_38, x_39, x_2, x_3, x_4, x_5, x_6, x_7, x_19);
-lean_dec(x_7);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
 lean_dec(x_27);
 lean_dec(x_26);
 x_41 = !lean_is_exclusive(x_40);
@@ -10836,11 +10849,6 @@ lean_dec(x_3);
 x_14 = lean_unbox_usize(x_4);
 lean_dec(x_4);
 x_15 = l_Array_foldlMUnsafe_fold___at_Lean_Elab_wfRecursion___spec__8(x_1, x_2, x_13, x_14, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12);
-lean_dec(x_11);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
 lean_dec(x_2);
 lean_dec(x_1);
 return x_15;

stage0/stdlib/Lean/Elab/PreDefinition/WF/PackMutual.c

@@ -324,7 +324,7 @@ x_16 = l_Std_Range_forIn_loop___at___private_Lean_Elab_PreDefinition_WF_PackMutu
 x_17 = l_Lean_Option_get___at_Lean_profiler_threshold_getSecs___spec__1(x_1, x_16);
 lean_ctor_set(x_10, 4, x_17);
 lean_ctor_set(x_10, 2, x_1);
-lean_ctor_set_uint8(x_10, sizeof(void*)*11, x_2);
+lean_ctor_set_uint8(x_10, sizeof(void*)*12, x_2);
 lean_inc(x_11);
 lean_inc(x_10);
 lean_inc(x_5);
@@ -486,7 +486,7 @@ return x_61;
 }
 else
 {
-lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; 
+lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; uint8_t x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; 
 x_62 = lean_ctor_get(x_10, 0);
 x_63 = lean_ctor_get(x_10, 1);
 x_64 = lean_ctor_get(x_10, 3);
@@ -496,6 +496,9 @@ x_67 = lean_ctor_get(x_10, 7);
 x_68 = lean_ctor_get(x_10, 8);
 x_69 = lean_ctor_get(x_10, 9);
 x_70 = lean_ctor_get(x_10, 10);
+x_71 = lean_ctor_get(x_10, 11);
+x_72 = lean_ctor_get_uint8(x_10, sizeof(void*)*12 + 1);
+lean_inc(x_71);
 lean_inc(x_70);
 lean_inc(x_69);
 lean_inc(x_68);
@@ -506,122 +509,124 @@ lean_inc(x_64);
 lean_inc(x_63);
 lean_inc(x_62);
 lean_dec(x_10);
-x_71 = l_Std_Range_forIn_loop___at___private_Lean_Elab_PreDefinition_WF_PackMutual_0__Lean_Elab_WF_checkCodomainsLevel___spec__1___lambda__1___closed__1;
-x_72 = l_Lean_Option_get___at_Lean_profiler_threshold_getSecs___spec__1(x_1, x_71);
-x_73 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_73, 0, x_62);
-lean_ctor_set(x_73, 1, x_63);
-lean_ctor_set(x_73, 2, x_1);
-lean_ctor_set(x_73, 3, x_64);
-lean_ctor_set(x_73, 4, x_72);
-lean_ctor_set(x_73, 5, x_65);
-lean_ctor_set(x_73, 6, x_66);
-lean_ctor_set(x_73, 7, x_67);
-lean_ctor_set(x_73, 8, x_68);
-lean_ctor_set(x_73, 9, x_69);
-lean_ctor_set(x_73, 10, x_70);
-lean_ctor_set_uint8(x_73, sizeof(void*)*11, x_2);
+x_73 = l_Std_Range_forIn_loop___at___private_Lean_Elab_PreDefinition_WF_PackMutual_0__Lean_Elab_WF_checkCodomainsLevel___spec__1___lambda__1___closed__1;
+x_74 = l_Lean_Option_get___at_Lean_profiler_threshold_getSecs___spec__1(x_1, x_73);
+x_75 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_75, 0, x_62);
+lean_ctor_set(x_75, 1, x_63);
+lean_ctor_set(x_75, 2, x_1);
+lean_ctor_set(x_75, 3, x_64);
+lean_ctor_set(x_75, 4, x_74);
+lean_ctor_set(x_75, 5, x_65);
+lean_ctor_set(x_75, 6, x_66);
+lean_ctor_set(x_75, 7, x_67);
+lean_ctor_set(x_75, 8, x_68);
+lean_ctor_set(x_75, 9, x_69);
+lean_ctor_set(x_75, 10, x_70);
+lean_ctor_set(x_75, 11, x_71);
+lean_ctor_set_uint8(x_75, sizeof(void*)*12, x_2);
+lean_ctor_set_uint8(x_75, sizeof(void*)*12 + 1, x_72);
 lean_inc(x_11);
-lean_inc(x_73);
+lean_inc(x_75);
 lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_3);
-x_74 = lean_infer_type(x_3, x_4, x_5, x_73, x_11, x_12);
-if (lean_obj_tag(x_74) == 0)
+x_76 = lean_infer_type(x_3, x_4, x_5, x_75, x_11, x_12);
+if (lean_obj_tag(x_76) == 0)
 {
-lean_object* x_75; lean_object* x_76; lean_object* x_77; 
-x_75 = lean_ctor_get(x_74, 0);
-lean_inc(x_75);
-x_76 = lean_ctor_get(x_74, 1);
-lean_inc(x_76);
-lean_dec(x_74);
+lean_object* x_77; lean_object* x_78; lean_object* x_79; 
+x_77 = lean_ctor_get(x_76, 0);
+lean_inc(x_77);
+x_78 = lean_ctor_get(x_76, 1);
+lean_inc(x_78);
+lean_dec(x_76);
 lean_inc(x_11);
-lean_inc(x_73);
+lean_inc(x_75);
 lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_6);
-x_77 = lean_infer_type(x_6, x_4, x_5, x_73, x_11, x_76);
-if (lean_obj_tag(x_77) == 0)
+x_79 = lean_infer_type(x_6, x_4, x_5, x_75, x_11, x_78);
+if (lean_obj_tag(x_79) == 0)
 {
-lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; 
-x_78 = lean_ctor_get(x_77, 0);
-lean_inc(x_78);
-x_79 = lean_ctor_get(x_77, 1);
-lean_inc(x_79);
-lean_dec(x_77);
-x_80 = lean_ctor_get(x_7, 3);
+lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; 
+x_80 = lean_ctor_get(x_79, 0);
 lean_inc(x_80);
+x_81 = lean_ctor_get(x_79, 1);
+lean_inc(x_81);
+lean_dec(x_79);
+x_82 = lean_ctor_get(x_7, 3);
+lean_inc(x_82);
 lean_dec(x_7);
-x_81 = l_Lean_MessageData_ofName(x_80);
-x_82 = l_Std_Range_forIn_loop___at___private_Lean_Elab_PreDefinition_WF_PackMutual_0__Lean_Elab_WF_checkCodomainsLevel___spec__1___lambda__1___closed__8;
-x_83 = lean_alloc_ctor(6, 2, 0);
-lean_ctor_set(x_83, 0, x_82);
-lean_ctor_set(x_83, 1, x_81);
-x_84 = l_Std_Range_forIn_loop___at___private_Lean_Elab_PreDefinition_WF_PackMutual_0__Lean_Elab_WF_checkCodomainsLevel___spec__1___lambda__1___closed__10;
+x_83 = l_Lean_MessageData_ofName(x_82);
+x_84 = l_Std_Range_forIn_loop___at___private_Lean_Elab_PreDefinition_WF_PackMutual_0__Lean_Elab_WF_checkCodomainsLevel___spec__1___lambda__1___closed__8;
 x_85 = lean_alloc_ctor(6, 2, 0);
-lean_ctor_set(x_85, 0, x_83);
-lean_ctor_set(x_85, 1, x_84);
-x_86 = l_Lean_indentExpr(x_3);
+lean_ctor_set(x_85, 0, x_84);
+lean_ctor_set(x_85, 1, x_83);
+x_86 = l_Std_Range_forIn_loop___at___private_Lean_Elab_PreDefinition_WF_PackMutual_0__Lean_Elab_WF_checkCodomainsLevel___spec__1___lambda__1___closed__10;
 x_87 = lean_alloc_ctor(6, 2, 0);
 lean_ctor_set(x_87, 0, x_85);
 lean_ctor_set(x_87, 1, x_86);
-x_88 = l_Std_Range_forIn_loop___at___private_Lean_Elab_PreDefinition_WF_PackMutual_0__Lean_Elab_WF_checkCodomainsLevel___spec__1___lambda__1___closed__12;
+x_88 = l_Lean_indentExpr(x_3);
 x_89 = lean_alloc_ctor(6, 2, 0);
 lean_ctor_set(x_89, 0, x_87);
 lean_ctor_set(x_89, 1, x_88);
-x_90 = l_Lean_MessageData_ofExpr(x_75);
+x_90 = l_Std_Range_forIn_loop___at___private_Lean_Elab_PreDefinition_WF_PackMutual_0__Lean_Elab_WF_checkCodomainsLevel___spec__1___lambda__1___closed__12;
 x_91 = lean_alloc_ctor(6, 2, 0);
 lean_ctor_set(x_91, 0, x_89);
 lean_ctor_set(x_91, 1, x_90);
-x_92 = l_Std_Range_forIn_loop___at___private_Lean_Elab_PreDefinition_WF_PackMutual_0__Lean_Elab_WF_checkCodomainsLevel___spec__1___lambda__1___closed__14;
+x_92 = l_Lean_MessageData_ofExpr(x_77);
 x_93 = lean_alloc_ctor(6, 2, 0);
 lean_ctor_set(x_93, 0, x_91);
 lean_ctor_set(x_93, 1, x_92);
-x_94 = l_Std_Range_forIn_loop___at___private_Lean_Elab_PreDefinition_WF_PackMutual_0__Lean_Elab_WF_checkCodomainsLevel___spec__1___lambda__1___closed__6;
+x_94 = l_Std_Range_forIn_loop___at___private_Lean_Elab_PreDefinition_WF_PackMutual_0__Lean_Elab_WF_checkCodomainsLevel___spec__1___lambda__1___closed__14;
 x_95 = lean_alloc_ctor(6, 2, 0);
-lean_ctor_set(x_95, 0, x_94);
-lean_ctor_set(x_95, 1, x_93);
-x_96 = lean_ctor_get(x_8, 3);
-lean_inc(x_96);
+lean_ctor_set(x_95, 0, x_93);
+lean_ctor_set(x_95, 1, x_94);
+x_96 = l_Std_Range_forIn_loop___at___private_Lean_Elab_PreDefinition_WF_PackMutual_0__Lean_Elab_WF_checkCodomainsLevel___spec__1___lambda__1___closed__6;
+x_97 = lean_alloc_ctor(6, 2, 0);
+lean_ctor_set(x_97, 0, x_96);
+lean_ctor_set(x_97, 1, x_95);
+x_98 = lean_ctor_get(x_8, 3);
+lean_inc(x_98);
 lean_dec(x_8);
-x_97 = l_Lean_MessageData_ofName(x_96);
-x_98 = l_Std_Range_forIn_loop___at___private_Lean_Elab_PreDefinition_WF_PackMutual_0__Lean_Elab_WF_checkCodomainsLevel___spec__1___lambda__1___closed__16;
-x_99 = lean_alloc_ctor(6, 2, 0);
-lean_ctor_set(x_99, 0, x_98);
-lean_ctor_set(x_99, 1, x_97);
-x_100 = lean_alloc_ctor(6, 2, 0);
-lean_ctor_set(x_100, 0, x_99);
-lean_ctor_set(x_100, 1, x_84);
-x_101 = l_Lean_indentExpr(x_6);
+x_99 = l_Lean_MessageData_ofName(x_98);
+x_100 = l_Std_Range_forIn_loop___at___private_Lean_Elab_PreDefinition_WF_PackMutual_0__Lean_Elab_WF_checkCodomainsLevel___spec__1___lambda__1___closed__16;
+x_101 = lean_alloc_ctor(6, 2, 0);
+lean_ctor_set(x_101, 0, x_100);
+lean_ctor_set(x_101, 1, x_99);
 x_102 = lean_alloc_ctor(6, 2, 0);
-lean_ctor_set(x_102, 0, x_100);
-lean_ctor_set(x_102, 1, x_101);
-x_103 = lean_alloc_ctor(6, 2, 0);
-lean_ctor_set(x_103, 0, x_102);
-lean_ctor_set(x_103, 1, x_88);
-x_104 = l_Lean_MessageData_ofExpr(x_78);
+lean_ctor_set(x_102, 0, x_101);
+lean_ctor_set(x_102, 1, x_86);
+x_103 = l_Lean_indentExpr(x_6);
+x_104 = lean_alloc_ctor(6, 2, 0);
+lean_ctor_set(x_104, 0, x_102);
+lean_ctor_set(x_104, 1, x_103);
 x_105 = lean_alloc_ctor(6, 2, 0);
-lean_ctor_set(x_105, 0, x_103);
-lean_ctor_set(x_105, 1, x_104);
-x_106 = l_Std_Range_forIn_loop___at___private_Lean_Elab_PreDefinition_WF_PackMutual_0__Lean_Elab_WF_checkCodomainsLevel___spec__1___lambda__1___closed__18;
+lean_ctor_set(x_105, 0, x_104);
+lean_ctor_set(x_105, 1, x_90);
+x_106 = l_Lean_MessageData_ofExpr(x_80);
 x_107 = lean_alloc_ctor(6, 2, 0);
 lean_ctor_set(x_107, 0, x_105);
 lean_ctor_set(x_107, 1, x_106);
-x_108 = lean_alloc_ctor(6, 2, 0);
-lean_ctor_set(x_108, 0, x_95);
-lean_ctor_set(x_108, 1, x_107);
-x_109 = l_Lean_throwError___at___private_Lean_Meta_Basic_0__Lean_Meta_processPostponedStep___spec__1(x_108, x_4, x_5, x_73, x_11, x_79);
+x_108 = l_Std_Range_forIn_loop___at___private_Lean_Elab_PreDefinition_WF_PackMutual_0__Lean_Elab_WF_checkCodomainsLevel___spec__1___lambda__1___closed__18;
+x_109 = lean_alloc_ctor(6, 2, 0);
+lean_ctor_set(x_109, 0, x_107);
+lean_ctor_set(x_109, 1, x_108);
+x_110 = lean_alloc_ctor(6, 2, 0);
+lean_ctor_set(x_110, 0, x_97);
+lean_ctor_set(x_110, 1, x_109);
+x_111 = l_Lean_throwError___at___private_Lean_Meta_Basic_0__Lean_Meta_processPostponedStep___spec__1(x_110, x_4, x_5, x_75, x_11, x_81);
 lean_dec(x_11);
-lean_dec(x_73);
-lean_dec(x_5);
-lean_dec(x_4);
-return x_109;
-}
-else
-{
-lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; 
 lean_dec(x_75);
-lean_dec(x_73);
+lean_dec(x_5);
+lean_dec(x_4);
+return x_111;
+}
+else
+{
+lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; 
+lean_dec(x_77);
+lean_dec(x_75);
 lean_dec(x_11);
 lean_dec(x_8);
 lean_dec(x_7);
@@ -629,32 +634,32 @@ lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_110 = lean_ctor_get(x_77, 0);
-lean_inc(x_110);
-x_111 = lean_ctor_get(x_77, 1);
-lean_inc(x_111);
-if (lean_is_exclusive(x_77)) {
- lean_ctor_release(x_77, 0);
- lean_ctor_release(x_77, 1);
- x_112 = x_77;
+x_112 = lean_ctor_get(x_79, 0);
+lean_inc(x_112);
+x_113 = lean_ctor_get(x_79, 1);
+lean_inc(x_113);
+if (lean_is_exclusive(x_79)) {
+ lean_ctor_release(x_79, 0);
+ lean_ctor_release(x_79, 1);
+ x_114 = x_79;
 } else {
- lean_dec_ref(x_77);
- x_112 = lean_box(0);
+ lean_dec_ref(x_79);
+ x_114 = lean_box(0);
 }
-if (lean_is_scalar(x_112)) {
- x_113 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_114)) {
+ x_115 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_113 = x_112;
+ x_115 = x_114;
 }
-lean_ctor_set(x_113, 0, x_110);
-lean_ctor_set(x_113, 1, x_111);
-return x_113;
+lean_ctor_set(x_115, 0, x_112);
+lean_ctor_set(x_115, 1, x_113);
+return x_115;
 }
 }
 else
 {
-lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; 
-lean_dec(x_73);
+lean_object* x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; 
+lean_dec(x_75);
 lean_dec(x_11);
 lean_dec(x_8);
 lean_dec(x_7);
@@ -662,26 +667,26 @@ lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_114 = lean_ctor_get(x_74, 0);
-lean_inc(x_114);
-x_115 = lean_ctor_get(x_74, 1);
-lean_inc(x_115);
-if (lean_is_exclusive(x_74)) {
- lean_ctor_release(x_74, 0);
- lean_ctor_release(x_74, 1);
- x_116 = x_74;
+x_116 = lean_ctor_get(x_76, 0);
+lean_inc(x_116);
+x_117 = lean_ctor_get(x_76, 1);
+lean_inc(x_117);
+if (lean_is_exclusive(x_76)) {
+ lean_ctor_release(x_76, 0);
+ lean_ctor_release(x_76, 1);
+ x_118 = x_76;
 } else {
- lean_dec_ref(x_74);
- x_116 = lean_box(0);
+ lean_dec_ref(x_76);
+ x_118 = lean_box(0);
 }
-if (lean_is_scalar(x_116)) {
- x_117 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_118)) {
+ x_119 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_117 = x_116;
+ x_119 = x_118;
 }
-lean_ctor_set(x_117, 0, x_114);
-lean_ctor_set(x_117, 1, x_115);
-return x_117;
+lean_ctor_set(x_119, 0, x_116);
+lean_ctor_set(x_119, 1, x_117);
+return x_119;
 }
 }
 }

stage0/stdlib/Lean/Elab/PreDefinition/WF/TerminationHint.c

@@ -303,17 +303,22 @@ _start:
 {
 lean_object* x_6; 
 x_6 = lean_ctor_get(x_1, 1);
+lean_inc(x_6);
 if (lean_obj_tag(x_6) == 0)
 {
 lean_object* x_7; 
 x_7 = lean_ctor_get(x_1, 2);
+lean_inc(x_7);
 if (lean_obj_tag(x_7) == 0)
 {
 lean_object* x_8; 
 x_8 = lean_ctor_get(x_1, 3);
+lean_inc(x_8);
+lean_dec(x_1);
 if (lean_obj_tag(x_8) == 0)
 {
 lean_object* x_9; lean_object* x_10; 
+lean_dec(x_4);
 lean_dec(x_3);
 x_9 = lean_box(0);
 x_10 = lean_alloc_ctor(0, 2, 0);
@@ -325,7 +330,11 @@ else
 {
 lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; uint8_t x_18; lean_object* x_19; 
 x_11 = lean_ctor_get(x_8, 0);
+lean_inc(x_11);
+lean_dec(x_8);
 x_12 = lean_ctor_get(x_11, 0);
+lean_inc(x_12);
+lean_dec(x_11);
 x_13 = l_Lean_stringToMessageData(x_2);
 x_14 = l_Lean_Elab_WF_TerminationHints_ensureNone___closed__2;
 x_15 = lean_alloc_ctor(6, 2, 0);
@@ -344,11 +353,17 @@ else
 {
 lean_object* x_20; 
 x_20 = lean_ctor_get(x_1, 3);
+lean_inc(x_20);
 if (lean_obj_tag(x_20) == 0)
 {
 lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; uint8_t x_28; lean_object* x_29; 
+lean_dec(x_1);
 x_21 = lean_ctor_get(x_7, 0);
+lean_inc(x_21);
+lean_dec(x_7);
 x_22 = lean_ctor_get(x_21, 0);
+lean_inc(x_22);
+lean_dec(x_21);
 x_23 = l_Lean_stringToMessageData(x_2);
 x_24 = l_Lean_Elab_WF_TerminationHints_ensureNone___closed__6;
 x_25 = lean_alloc_ctor(6, 2, 0);
@@ -365,7 +380,11 @@ return x_29;
 else
 {
 lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; uint8_t x_36; lean_object* x_37; 
+lean_dec(x_20);
+lean_dec(x_7);
 x_30 = lean_ctor_get(x_1, 0);
+lean_inc(x_30);
+lean_dec(x_1);
 x_31 = l_Lean_stringToMessageData(x_2);
 x_32 = l_Lean_Elab_WF_TerminationHints_ensureNone___closed__8;
 x_33 = lean_alloc_ctor(6, 2, 0);
@@ -385,14 +404,19 @@ else
 {
 lean_object* x_38; 
 x_38 = lean_ctor_get(x_1, 2);
+lean_inc(x_38);
 if (lean_obj_tag(x_38) == 0)
 {
 lean_object* x_39; 
 x_39 = lean_ctor_get(x_1, 3);
+lean_inc(x_39);
 if (lean_obj_tag(x_39) == 0)
 {
 lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; uint8_t x_46; lean_object* x_47; 
+lean_dec(x_1);
 x_40 = lean_ctor_get(x_6, 0);
+lean_inc(x_40);
+lean_dec(x_6);
 x_41 = l_Lean_stringToMessageData(x_2);
 x_42 = l_Lean_Elab_WF_TerminationHints_ensureNone___closed__10;
 x_43 = lean_alloc_ctor(6, 2, 0);
@@ -409,7 +433,11 @@ return x_47;
 else
 {
 lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; uint8_t x_54; lean_object* x_55; 
+lean_dec(x_39);
+lean_dec(x_6);
 x_48 = lean_ctor_get(x_1, 0);
+lean_inc(x_48);
+lean_dec(x_1);
 x_49 = l_Lean_stringToMessageData(x_2);
 x_50 = l_Lean_Elab_WF_TerminationHints_ensureNone___closed__8;
 x_51 = lean_alloc_ctor(6, 2, 0);
@@ -427,7 +455,11 @@ return x_55;
 else
 {
 lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; uint8_t x_62; lean_object* x_63; 
+lean_dec(x_38);
+lean_dec(x_6);
 x_56 = lean_ctor_get(x_1, 0);
+lean_inc(x_56);
+lean_dec(x_1);
 x_57 = l_Lean_stringToMessageData(x_2);
 x_58 = l_Lean_Elab_WF_TerminationHints_ensureNone___closed__8;
 x_59 = lean_alloc_ctor(6, 2, 0);
@@ -449,9 +481,7 @@ _start:
 {
 lean_object* x_6; 
 x_6 = l_Lean_Elab_WF_TerminationHints_ensureNone(x_1, x_2, x_3, x_4, x_5);
-lean_dec(x_4);
 lean_dec(x_2);
-lean_dec(x_1);
 return x_6;
 }
 }
@@ -651,7 +681,7 @@ return x_11;
 }
 else
 {
-lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; uint8_t x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; 
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; uint8_t x_23; lean_object* x_24; uint8_t x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; 
 x_12 = lean_ctor_get(x_5, 0);
 x_13 = lean_ctor_get(x_5, 1);
 x_14 = lean_ctor_get(x_5, 2);
@@ -663,7 +693,10 @@ x_19 = lean_ctor_get(x_5, 7);
 x_20 = lean_ctor_get(x_5, 8);
 x_21 = lean_ctor_get(x_5, 9);
 x_22 = lean_ctor_get(x_5, 10);
-x_23 = lean_ctor_get_uint8(x_5, sizeof(void*)*11);
+x_23 = lean_ctor_get_uint8(x_5, sizeof(void*)*12);
+x_24 = lean_ctor_get(x_5, 11);
+x_25 = lean_ctor_get_uint8(x_5, sizeof(void*)*12 + 1);
+lean_inc(x_24);
 lean_inc(x_22);
 lean_inc(x_21);
 lean_inc(x_20);
@@ -676,24 +709,26 @@ lean_inc(x_14);
 lean_inc(x_13);
 lean_inc(x_12);
 lean_dec(x_5);
-x_24 = l_Lean_replaceRef(x_1, x_17);
+x_26 = l_Lean_replaceRef(x_1, x_17);
 lean_dec(x_17);
-x_25 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_25, 0, x_12);
-lean_ctor_set(x_25, 1, x_13);
-lean_ctor_set(x_25, 2, x_14);
-lean_ctor_set(x_25, 3, x_15);
-lean_ctor_set(x_25, 4, x_16);
-lean_ctor_set(x_25, 5, x_24);
-lean_ctor_set(x_25, 6, x_18);
-lean_ctor_set(x_25, 7, x_19);
-lean_ctor_set(x_25, 8, x_20);
-lean_ctor_set(x_25, 9, x_21);
-lean_ctor_set(x_25, 10, x_22);
-lean_ctor_set_uint8(x_25, sizeof(void*)*11, x_23);
-x_26 = l_Lean_throwError___at_Lean_Meta_setInlineAttribute___spec__1(x_2, x_3, x_4, x_25, x_6, x_7);
-lean_dec(x_25);
-return x_26;
+x_27 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_27, 0, x_12);
+lean_ctor_set(x_27, 1, x_13);
+lean_ctor_set(x_27, 2, x_14);
+lean_ctor_set(x_27, 3, x_15);
+lean_ctor_set(x_27, 4, x_16);
+lean_ctor_set(x_27, 5, x_26);
+lean_ctor_set(x_27, 6, x_18);
+lean_ctor_set(x_27, 7, x_19);
+lean_ctor_set(x_27, 8, x_20);
+lean_ctor_set(x_27, 9, x_21);
+lean_ctor_set(x_27, 10, x_22);
+lean_ctor_set(x_27, 11, x_24);
+lean_ctor_set_uint8(x_27, sizeof(void*)*12, x_23);
+lean_ctor_set_uint8(x_27, sizeof(void*)*12 + 1, x_25);
+x_28 = l_Lean_throwError___at_Lean_Meta_setInlineAttribute___spec__1(x_2, x_3, x_4, x_27, x_6, x_7);
+lean_dec(x_27);
+return x_28;
 }
 }
 }

stage0/stdlib/Lean/Elab/Print.c

@@ -4623,7 +4623,7 @@ return x_30;
 }
 else
 {
-lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; 
+lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; uint8_t x_40; lean_object* x_41; lean_object* x_42; 
 x_31 = lean_ctor_get(x_2, 0);
 x_32 = lean_ctor_get(x_2, 1);
 x_33 = lean_ctor_get(x_2, 2);
@@ -4632,6 +4632,9 @@ x_35 = lean_ctor_get(x_2, 4);
 x_36 = lean_ctor_get(x_2, 5);
 x_37 = lean_ctor_get(x_2, 7);
 x_38 = lean_ctor_get(x_2, 8);
+x_39 = lean_ctor_get(x_2, 9);
+x_40 = lean_ctor_get_uint8(x_2, sizeof(void*)*10);
+lean_inc(x_39);
 lean_inc(x_38);
 lean_inc(x_37);
 lean_inc(x_36);
@@ -4641,18 +4644,20 @@ lean_inc(x_33);
 lean_inc(x_32);
 lean_inc(x_31);
 lean_dec(x_2);
-x_39 = lean_alloc_ctor(0, 9, 0);
-lean_ctor_set(x_39, 0, x_31);
-lean_ctor_set(x_39, 1, x_32);
-lean_ctor_set(x_39, 2, x_33);
-lean_ctor_set(x_39, 3, x_34);
-lean_ctor_set(x_39, 4, x_35);
-lean_ctor_set(x_39, 5, x_36);
-lean_ctor_set(x_39, 6, x_27);
-lean_ctor_set(x_39, 7, x_37);
-lean_ctor_set(x_39, 8, x_38);
-x_40 = l___private_Lean_Elab_Print_0__Lean_Elab_Command_printId(x_12, x_39, x_3, x_26);
-return x_40;
+x_41 = lean_alloc_ctor(0, 10, 1);
+lean_ctor_set(x_41, 0, x_31);
+lean_ctor_set(x_41, 1, x_32);
+lean_ctor_set(x_41, 2, x_33);
+lean_ctor_set(x_41, 3, x_34);
+lean_ctor_set(x_41, 4, x_35);
+lean_ctor_set(x_41, 5, x_36);
+lean_ctor_set(x_41, 6, x_27);
+lean_ctor_set(x_41, 7, x_37);
+lean_ctor_set(x_41, 8, x_38);
+lean_ctor_set(x_41, 9, x_39);
+lean_ctor_set_uint8(x_41, sizeof(void*)*10, x_40);
+x_42 = l___private_Lean_Elab_Print_0__Lean_Elab_Command_printId(x_12, x_41, x_3, x_26);
+return x_42;
 }
 }
 }
@@ -6359,7 +6364,7 @@ return x_27;
 }
 else
 {
-lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; 
+lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; uint8_t x_37; lean_object* x_38; lean_object* x_39; 
 x_28 = lean_ctor_get(x_2, 0);
 x_29 = lean_ctor_get(x_2, 1);
 x_30 = lean_ctor_get(x_2, 2);
@@ -6368,6 +6373,9 @@ x_32 = lean_ctor_get(x_2, 4);
 x_33 = lean_ctor_get(x_2, 5);
 x_34 = lean_ctor_get(x_2, 7);
 x_35 = lean_ctor_get(x_2, 8);
+x_36 = lean_ctor_get(x_2, 9);
+x_37 = lean_ctor_get_uint8(x_2, sizeof(void*)*10);
+lean_inc(x_36);
 lean_inc(x_35);
 lean_inc(x_34);
 lean_inc(x_33);
@@ -6377,53 +6385,55 @@ lean_inc(x_30);
 lean_inc(x_29);
 lean_inc(x_28);
 lean_dec(x_2);
-x_36 = lean_alloc_ctor(0, 9, 0);
-lean_ctor_set(x_36, 0, x_28);
-lean_ctor_set(x_36, 1, x_29);
-lean_ctor_set(x_36, 2, x_30);
-lean_ctor_set(x_36, 3, x_31);
-lean_ctor_set(x_36, 4, x_32);
-lean_ctor_set(x_36, 5, x_33);
-lean_ctor_set(x_36, 6, x_17);
-lean_ctor_set(x_36, 7, x_34);
-lean_ctor_set(x_36, 8, x_35);
-x_37 = l_Lean_Elab_Command_liftCoreM___rarg(x_13, x_36, x_3, x_16);
-if (lean_obj_tag(x_37) == 0)
+x_38 = lean_alloc_ctor(0, 10, 1);
+lean_ctor_set(x_38, 0, x_28);
+lean_ctor_set(x_38, 1, x_29);
+lean_ctor_set(x_38, 2, x_30);
+lean_ctor_set(x_38, 3, x_31);
+lean_ctor_set(x_38, 4, x_32);
+lean_ctor_set(x_38, 5, x_33);
+lean_ctor_set(x_38, 6, x_17);
+lean_ctor_set(x_38, 7, x_34);
+lean_ctor_set(x_38, 8, x_35);
+lean_ctor_set(x_38, 9, x_36);
+lean_ctor_set_uint8(x_38, sizeof(void*)*10, x_37);
+x_39 = l_Lean_Elab_Command_liftCoreM___rarg(x_13, x_38, x_3, x_16);
+if (lean_obj_tag(x_39) == 0)
 {
-lean_object* x_38; lean_object* x_39; lean_object* x_40; 
-x_38 = lean_ctor_get(x_37, 0);
-lean_inc(x_38);
-x_39 = lean_ctor_get(x_37, 1);
-lean_inc(x_39);
-lean_dec(x_37);
-x_40 = l_List_forM___at_Lean_Elab_Command_elabPrintAxioms___spec__2(x_38, x_36, x_3, x_39);
-return x_40;
+lean_object* x_40; lean_object* x_41; lean_object* x_42; 
+x_40 = lean_ctor_get(x_39, 0);
+lean_inc(x_40);
+x_41 = lean_ctor_get(x_39, 1);
+lean_inc(x_41);
+lean_dec(x_39);
+x_42 = l_List_forM___at_Lean_Elab_Command_elabPrintAxioms___spec__2(x_40, x_38, x_3, x_41);
+return x_42;
 }
 else
 {
-lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; 
-lean_dec(x_36);
+lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; 
+lean_dec(x_38);
 lean_dec(x_3);
-x_41 = lean_ctor_get(x_37, 0);
-lean_inc(x_41);
-x_42 = lean_ctor_get(x_37, 1);
-lean_inc(x_42);
-if (lean_is_exclusive(x_37)) {
- lean_ctor_release(x_37, 0);
- lean_ctor_release(x_37, 1);
- x_43 = x_37;
+x_43 = lean_ctor_get(x_39, 0);
+lean_inc(x_43);
+x_44 = lean_ctor_get(x_39, 1);
+lean_inc(x_44);
+if (lean_is_exclusive(x_39)) {
+ lean_ctor_release(x_39, 0);
+ lean_ctor_release(x_39, 1);
+ x_45 = x_39;
 } else {
- lean_dec_ref(x_37);
- x_43 = lean_box(0);
+ lean_dec_ref(x_39);
+ x_45 = lean_box(0);
 }
-if (lean_is_scalar(x_43)) {
- x_44 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_45)) {
+ x_46 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_44 = x_43;
+ x_46 = x_45;
 }
-lean_ctor_set(x_44, 0, x_41);
-lean_ctor_set(x_44, 1, x_42);
-return x_44;
+lean_ctor_set(x_46, 0, x_43);
+lean_ctor_set(x_46, 1, x_44);
+return x_46;
 }
 }
 }

stage0/stdlib/Lean/Elab/Quotation.c

@@ -7500,7 +7500,7 @@ return x_13;
 }
 else
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; 
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; lean_object* x_26; uint8_t x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; 
 x_14 = lean_ctor_get(x_7, 0);
 x_15 = lean_ctor_get(x_7, 1);
 x_16 = lean_ctor_get(x_7, 2);
@@ -7512,7 +7512,10 @@ x_21 = lean_ctor_get(x_7, 7);
 x_22 = lean_ctor_get(x_7, 8);
 x_23 = lean_ctor_get(x_7, 9);
 x_24 = lean_ctor_get(x_7, 10);
-x_25 = lean_ctor_get_uint8(x_7, sizeof(void*)*11);
+x_25 = lean_ctor_get_uint8(x_7, sizeof(void*)*12);
+x_26 = lean_ctor_get(x_7, 11);
+x_27 = lean_ctor_get_uint8(x_7, sizeof(void*)*12 + 1);
+lean_inc(x_26);
 lean_inc(x_24);
 lean_inc(x_23);
 lean_inc(x_22);
@@ -7525,29 +7528,31 @@ lean_inc(x_16);
 lean_inc(x_15);
 lean_inc(x_14);
 lean_dec(x_7);
-x_26 = l_Lean_replaceRef(x_1, x_19);
+x_28 = l_Lean_replaceRef(x_1, x_19);
 lean_dec(x_19);
 lean_dec(x_1);
-x_27 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_27, 0, x_14);
-lean_ctor_set(x_27, 1, x_15);
-lean_ctor_set(x_27, 2, x_16);
-lean_ctor_set(x_27, 3, x_17);
-lean_ctor_set(x_27, 4, x_18);
-lean_ctor_set(x_27, 5, x_26);
-lean_ctor_set(x_27, 6, x_20);
-lean_ctor_set(x_27, 7, x_21);
-lean_ctor_set(x_27, 8, x_22);
-lean_ctor_set(x_27, 9, x_23);
-lean_ctor_set(x_27, 10, x_24);
-lean_ctor_set_uint8(x_27, sizeof(void*)*11, x_25);
-x_28 = l_Lean_throwError___at___private_Lean_Elab_Quotation_0__Lean_Elab_Term_Quotation_quoteSyntax___spec__21(x_2, x_3, x_4, x_5, x_6, x_27, x_8, x_9);
+x_29 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_29, 0, x_14);
+lean_ctor_set(x_29, 1, x_15);
+lean_ctor_set(x_29, 2, x_16);
+lean_ctor_set(x_29, 3, x_17);
+lean_ctor_set(x_29, 4, x_18);
+lean_ctor_set(x_29, 5, x_28);
+lean_ctor_set(x_29, 6, x_20);
+lean_ctor_set(x_29, 7, x_21);
+lean_ctor_set(x_29, 8, x_22);
+lean_ctor_set(x_29, 9, x_23);
+lean_ctor_set(x_29, 10, x_24);
+lean_ctor_set(x_29, 11, x_26);
+lean_ctor_set_uint8(x_29, sizeof(void*)*12, x_25);
+lean_ctor_set_uint8(x_29, sizeof(void*)*12 + 1, x_27);
+x_30 = l_Lean_throwError___at___private_Lean_Elab_Quotation_0__Lean_Elab_Term_Quotation_quoteSyntax___spec__21(x_2, x_3, x_4, x_5, x_6, x_29, x_8, x_9);
 lean_dec(x_8);
-lean_dec(x_27);
+lean_dec(x_29);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-return x_28;
+return x_30;
 }
 }
 }
@@ -13181,7 +13186,7 @@ return x_13;
 }
 else
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; 
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; lean_object* x_26; uint8_t x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; 
 x_14 = lean_ctor_get(x_7, 0);
 x_15 = lean_ctor_get(x_7, 1);
 x_16 = lean_ctor_get(x_7, 2);
@@ -13193,7 +13198,10 @@ x_21 = lean_ctor_get(x_7, 7);
 x_22 = lean_ctor_get(x_7, 8);
 x_23 = lean_ctor_get(x_7, 9);
 x_24 = lean_ctor_get(x_7, 10);
-x_25 = lean_ctor_get_uint8(x_7, sizeof(void*)*11);
+x_25 = lean_ctor_get_uint8(x_7, sizeof(void*)*12);
+x_26 = lean_ctor_get(x_7, 11);
+x_27 = lean_ctor_get_uint8(x_7, sizeof(void*)*12 + 1);
+lean_inc(x_26);
 lean_inc(x_24);
 lean_inc(x_23);
 lean_inc(x_22);
@@ -13206,29 +13214,31 @@ lean_inc(x_16);
 lean_inc(x_15);
 lean_inc(x_14);
 lean_dec(x_7);
-x_26 = l_Lean_replaceRef(x_1, x_19);
+x_28 = l_Lean_replaceRef(x_1, x_19);
 lean_dec(x_19);
 lean_dec(x_1);
-x_27 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_27, 0, x_14);
-lean_ctor_set(x_27, 1, x_15);
-lean_ctor_set(x_27, 2, x_16);
-lean_ctor_set(x_27, 3, x_17);
-lean_ctor_set(x_27, 4, x_18);
-lean_ctor_set(x_27, 5, x_26);
-lean_ctor_set(x_27, 6, x_20);
-lean_ctor_set(x_27, 7, x_21);
-lean_ctor_set(x_27, 8, x_22);
-lean_ctor_set(x_27, 9, x_23);
-lean_ctor_set(x_27, 10, x_24);
-lean_ctor_set_uint8(x_27, sizeof(void*)*11, x_25);
-x_28 = l_Lean_throwError___at___private_Lean_Elab_Quotation_0__Lean_Elab_Term_Quotation_quoteSyntax___spec__25(x_2, x_3, x_4, x_5, x_6, x_27, x_8, x_9);
+x_29 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_29, 0, x_14);
+lean_ctor_set(x_29, 1, x_15);
+lean_ctor_set(x_29, 2, x_16);
+lean_ctor_set(x_29, 3, x_17);
+lean_ctor_set(x_29, 4, x_18);
+lean_ctor_set(x_29, 5, x_28);
+lean_ctor_set(x_29, 6, x_20);
+lean_ctor_set(x_29, 7, x_21);
+lean_ctor_set(x_29, 8, x_22);
+lean_ctor_set(x_29, 9, x_23);
+lean_ctor_set(x_29, 10, x_24);
+lean_ctor_set(x_29, 11, x_26);
+lean_ctor_set_uint8(x_29, sizeof(void*)*12, x_25);
+lean_ctor_set_uint8(x_29, sizeof(void*)*12 + 1, x_27);
+x_30 = l_Lean_throwError___at___private_Lean_Elab_Quotation_0__Lean_Elab_Term_Quotation_quoteSyntax___spec__25(x_2, x_3, x_4, x_5, x_6, x_29, x_8, x_9);
 lean_dec(x_8);
-lean_dec(x_27);
+lean_dec(x_29);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-return x_28;
+return x_30;
 }
 }
 }
@@ -20524,7 +20534,7 @@ return x_13;
 }
 else
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; 
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; lean_object* x_26; uint8_t x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; 
 x_14 = lean_ctor_get(x_7, 0);
 x_15 = lean_ctor_get(x_7, 1);
 x_16 = lean_ctor_get(x_7, 2);
@@ -20536,7 +20546,10 @@ x_21 = lean_ctor_get(x_7, 7);
 x_22 = lean_ctor_get(x_7, 8);
 x_23 = lean_ctor_get(x_7, 9);
 x_24 = lean_ctor_get(x_7, 10);
-x_25 = lean_ctor_get_uint8(x_7, sizeof(void*)*11);
+x_25 = lean_ctor_get_uint8(x_7, sizeof(void*)*12);
+x_26 = lean_ctor_get(x_7, 11);
+x_27 = lean_ctor_get_uint8(x_7, sizeof(void*)*12 + 1);
+lean_inc(x_26);
 lean_inc(x_24);
 lean_inc(x_23);
 lean_inc(x_22);
@@ -20549,29 +20562,31 @@ lean_inc(x_16);
 lean_inc(x_15);
 lean_inc(x_14);
 lean_dec(x_7);
-x_26 = l_Lean_replaceRef(x_1, x_19);
+x_28 = l_Lean_replaceRef(x_1, x_19);
 lean_dec(x_19);
 lean_dec(x_1);
-x_27 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_27, 0, x_14);
-lean_ctor_set(x_27, 1, x_15);
-lean_ctor_set(x_27, 2, x_16);
-lean_ctor_set(x_27, 3, x_17);
-lean_ctor_set(x_27, 4, x_18);
-lean_ctor_set(x_27, 5, x_26);
-lean_ctor_set(x_27, 6, x_20);
-lean_ctor_set(x_27, 7, x_21);
-lean_ctor_set(x_27, 8, x_22);
-lean_ctor_set(x_27, 9, x_23);
-lean_ctor_set(x_27, 10, x_24);
-lean_ctor_set_uint8(x_27, sizeof(void*)*11, x_25);
-x_28 = l_Lean_throwError___at___private_Lean_Elab_Quotation_0__Lean_Elab_Term_Quotation_getHeadInfo___spec__2(x_2, x_3, x_4, x_5, x_6, x_27, x_8, x_9);
+x_29 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_29, 0, x_14);
+lean_ctor_set(x_29, 1, x_15);
+lean_ctor_set(x_29, 2, x_16);
+lean_ctor_set(x_29, 3, x_17);
+lean_ctor_set(x_29, 4, x_18);
+lean_ctor_set(x_29, 5, x_28);
+lean_ctor_set(x_29, 6, x_20);
+lean_ctor_set(x_29, 7, x_21);
+lean_ctor_set(x_29, 8, x_22);
+lean_ctor_set(x_29, 9, x_23);
+lean_ctor_set(x_29, 10, x_24);
+lean_ctor_set(x_29, 11, x_26);
+lean_ctor_set_uint8(x_29, sizeof(void*)*12, x_25);
+lean_ctor_set_uint8(x_29, sizeof(void*)*12 + 1, x_27);
+x_30 = l_Lean_throwError___at___private_Lean_Elab_Quotation_0__Lean_Elab_Term_Quotation_getHeadInfo___spec__2(x_2, x_3, x_4, x_5, x_6, x_29, x_8, x_9);
 lean_dec(x_8);
-lean_dec(x_27);
+lean_dec(x_29);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-return x_28;
+return x_30;
 }
 }
 }
@@ -40519,11 +40534,6 @@ lean_object* x_13; uint8_t x_14; lean_object* x_15; uint8_t x_16;
 x_13 = l___private_Lean_Elab_Quotation_0__Lean_Elab_Term_Quotation_compileStxMatch___lambda__5___closed__3;
 x_14 = 2;
 x_15 = l_Lean_log___at_Lean_Elab_Term_exceptionToSorry___spec__2(x_13, x_14, x_6, x_7, x_8, x_9, x_10, x_11, x_12);
-lean_dec(x_11);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
 x_16 = !lean_is_exclusive(x_15);
 if (x_16 == 0)
 {
@@ -40609,11 +40619,6 @@ lean_dec(x_1);
 x_31 = l___private_Lean_Elab_Quotation_0__Lean_Elab_Term_Quotation_compileStxMatch___lambda__5___closed__3;
 x_32 = 2;
 x_33 = l_Lean_log___at_Lean_Elab_Term_exceptionToSorry___spec__2(x_31, x_32, x_6, x_7, x_8, x_9, x_10, x_11, x_12);
-lean_dec(x_11);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
 x_34 = !lean_is_exclusive(x_33);
 if (x_34 == 0)
 {

stage0/stdlib/Lean/Elab/Quotation/Precheck.c

@@ -45,6 +45,7 @@ LEAN_EXPORT lean_object* l_Lean_Elab_liftMacroM___at_Lean_Elab_Term_Quotation_pr
 lean_object* l_Lean_indentD(lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Term_Quotation_precheckRightact___closed__3;
 static lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Elab_Term_Quotation_precheckChoice___spec__5___closed__3;
+uint8_t l_Lean_Exception_isInterrupt(lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Term_Quotation_precheckRightact___closed__2;
 static lean_object* l_Lean_Elab_Term_Quotation_initFn____x40_Lean_Elab_Quotation_Precheck___hyg_119____closed__1;
 LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at_Lean_Elab_Term_Quotation_precheck_hasQuotedIdent___spec__1___boxed(lean_object*, lean_object*, lean_object*);
@@ -1565,7 +1566,7 @@ return x_14;
 }
 else
 {
-lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; uint8_t x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; 
+lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; uint8_t x_26; lean_object* x_27; uint8_t x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; 
 x_15 = lean_ctor_get(x_8, 0);
 x_16 = lean_ctor_get(x_8, 1);
 x_17 = lean_ctor_get(x_8, 2);
@@ -1577,7 +1578,10 @@ x_22 = lean_ctor_get(x_8, 7);
 x_23 = lean_ctor_get(x_8, 8);
 x_24 = lean_ctor_get(x_8, 9);
 x_25 = lean_ctor_get(x_8, 10);
-x_26 = lean_ctor_get_uint8(x_8, sizeof(void*)*11);
+x_26 = lean_ctor_get_uint8(x_8, sizeof(void*)*12);
+x_27 = lean_ctor_get(x_8, 11);
+x_28 = lean_ctor_get_uint8(x_8, sizeof(void*)*12 + 1);
+lean_inc(x_27);
 lean_inc(x_25);
 lean_inc(x_24);
 lean_inc(x_23);
@@ -1590,31 +1594,33 @@ lean_inc(x_17);
 lean_inc(x_16);
 lean_inc(x_15);
 lean_dec(x_8);
-x_27 = l_Lean_replaceRef(x_1, x_20);
+x_29 = l_Lean_replaceRef(x_1, x_20);
 lean_dec(x_20);
 lean_dec(x_1);
-x_28 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_28, 0, x_15);
-lean_ctor_set(x_28, 1, x_16);
-lean_ctor_set(x_28, 2, x_17);
-lean_ctor_set(x_28, 3, x_18);
-lean_ctor_set(x_28, 4, x_19);
-lean_ctor_set(x_28, 5, x_27);
-lean_ctor_set(x_28, 6, x_21);
-lean_ctor_set(x_28, 7, x_22);
-lean_ctor_set(x_28, 8, x_23);
-lean_ctor_set(x_28, 9, x_24);
-lean_ctor_set(x_28, 10, x_25);
-lean_ctor_set_uint8(x_28, sizeof(void*)*11, x_26);
-x_29 = l_Lean_throwError___at_Lean_Elab_Term_Quotation_precheck___spec__6(x_2, x_3, x_4, x_5, x_6, x_7, x_28, x_9, x_10);
+x_30 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_30, 0, x_15);
+lean_ctor_set(x_30, 1, x_16);
+lean_ctor_set(x_30, 2, x_17);
+lean_ctor_set(x_30, 3, x_18);
+lean_ctor_set(x_30, 4, x_19);
+lean_ctor_set(x_30, 5, x_29);
+lean_ctor_set(x_30, 6, x_21);
+lean_ctor_set(x_30, 7, x_22);
+lean_ctor_set(x_30, 8, x_23);
+lean_ctor_set(x_30, 9, x_24);
+lean_ctor_set(x_30, 10, x_25);
+lean_ctor_set(x_30, 11, x_27);
+lean_ctor_set_uint8(x_30, sizeof(void*)*12, x_26);
+lean_ctor_set_uint8(x_30, sizeof(void*)*12 + 1, x_28);
+x_31 = l_Lean_throwError___at_Lean_Elab_Term_Quotation_precheck___spec__6(x_2, x_3, x_4, x_5, x_6, x_7, x_30, x_9, x_10);
 lean_dec(x_9);
-lean_dec(x_28);
+lean_dec(x_30);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-return x_29;
+return x_31;
 }
 }
 }
@@ -2374,7 +2380,7 @@ return x_14;
 }
 else
 {
-lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; uint8_t x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; 
+lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; uint8_t x_26; lean_object* x_27; uint8_t x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; 
 x_15 = lean_ctor_get(x_8, 0);
 x_16 = lean_ctor_get(x_8, 1);
 x_17 = lean_ctor_get(x_8, 2);
@@ -2386,7 +2392,10 @@ x_22 = lean_ctor_get(x_8, 7);
 x_23 = lean_ctor_get(x_8, 8);
 x_24 = lean_ctor_get(x_8, 9);
 x_25 = lean_ctor_get(x_8, 10);
-x_26 = lean_ctor_get_uint8(x_8, sizeof(void*)*11);
+x_26 = lean_ctor_get_uint8(x_8, sizeof(void*)*12);
+x_27 = lean_ctor_get(x_8, 11);
+x_28 = lean_ctor_get_uint8(x_8, sizeof(void*)*12 + 1);
+lean_inc(x_27);
 lean_inc(x_25);
 lean_inc(x_24);
 lean_inc(x_23);
@@ -2399,31 +2408,33 @@ lean_inc(x_17);
 lean_inc(x_16);
 lean_inc(x_15);
 lean_dec(x_8);
-x_27 = l_Lean_replaceRef(x_1, x_20);
+x_29 = l_Lean_replaceRef(x_1, x_20);
 lean_dec(x_20);
 lean_dec(x_1);
-x_28 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_28, 0, x_15);
-lean_ctor_set(x_28, 1, x_16);
-lean_ctor_set(x_28, 2, x_17);
-lean_ctor_set(x_28, 3, x_18);
-lean_ctor_set(x_28, 4, x_19);
-lean_ctor_set(x_28, 5, x_27);
-lean_ctor_set(x_28, 6, x_21);
-lean_ctor_set(x_28, 7, x_22);
-lean_ctor_set(x_28, 8, x_23);
-lean_ctor_set(x_28, 9, x_24);
-lean_ctor_set(x_28, 10, x_25);
-lean_ctor_set_uint8(x_28, sizeof(void*)*11, x_26);
-x_29 = l_Lean_throwError___at_Lean_Elab_Term_Quotation_precheck___spec__10(x_2, x_3, x_4, x_5, x_6, x_7, x_28, x_9, x_10);
+x_30 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_30, 0, x_15);
+lean_ctor_set(x_30, 1, x_16);
+lean_ctor_set(x_30, 2, x_17);
+lean_ctor_set(x_30, 3, x_18);
+lean_ctor_set(x_30, 4, x_19);
+lean_ctor_set(x_30, 5, x_29);
+lean_ctor_set(x_30, 6, x_21);
+lean_ctor_set(x_30, 7, x_22);
+lean_ctor_set(x_30, 8, x_23);
+lean_ctor_set(x_30, 9, x_24);
+lean_ctor_set(x_30, 10, x_25);
+lean_ctor_set(x_30, 11, x_27);
+lean_ctor_set_uint8(x_30, sizeof(void*)*12, x_26);
+lean_ctor_set_uint8(x_30, sizeof(void*)*12 + 1, x_28);
+x_31 = l_Lean_throwError___at_Lean_Elab_Term_Quotation_precheck___spec__10(x_2, x_3, x_4, x_5, x_6, x_7, x_30, x_9, x_10);
 lean_dec(x_9);
-lean_dec(x_28);
+lean_dec(x_30);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-return x_29;
+return x_31;
 }
 }
 }
@@ -2732,7 +2743,7 @@ return x_18;
 }
 else
 {
-lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; uint8_t x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; 
+lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; uint8_t x_31; lean_object* x_32; uint8_t x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; 
 x_19 = lean_ctor_get(x_16, 0);
 lean_inc(x_19);
 lean_dec(x_16);
@@ -2758,22 +2769,27 @@ x_29 = lean_ctor_get(x_7, 9);
 lean_inc(x_29);
 x_30 = lean_ctor_get(x_7, 10);
 lean_inc(x_30);
-x_31 = lean_ctor_get_uint8(x_7, sizeof(void*)*11);
-x_32 = l_Lean_replaceRef(x_1, x_25);
+x_31 = lean_ctor_get_uint8(x_7, sizeof(void*)*12);
+x_32 = lean_ctor_get(x_7, 11);
+lean_inc(x_32);
+x_33 = lean_ctor_get_uint8(x_7, sizeof(void*)*12 + 1);
+x_34 = l_Lean_replaceRef(x_1, x_25);
 lean_dec(x_25);
-x_33 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_33, 0, x_20);
-lean_ctor_set(x_33, 1, x_21);
-lean_ctor_set(x_33, 2, x_22);
-lean_ctor_set(x_33, 3, x_23);
-lean_ctor_set(x_33, 4, x_24);
-lean_ctor_set(x_33, 5, x_32);
-lean_ctor_set(x_33, 6, x_26);
-lean_ctor_set(x_33, 7, x_27);
-lean_ctor_set(x_33, 8, x_28);
-lean_ctor_set(x_33, 9, x_29);
-lean_ctor_set(x_33, 10, x_30);
-lean_ctor_set_uint8(x_33, sizeof(void*)*11, x_31);
+x_35 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_35, 0, x_20);
+lean_ctor_set(x_35, 1, x_21);
+lean_ctor_set(x_35, 2, x_22);
+lean_ctor_set(x_35, 3, x_23);
+lean_ctor_set(x_35, 4, x_24);
+lean_ctor_set(x_35, 5, x_34);
+lean_ctor_set(x_35, 6, x_26);
+lean_ctor_set(x_35, 7, x_27);
+lean_ctor_set(x_35, 8, x_28);
+lean_ctor_set(x_35, 9, x_29);
+lean_ctor_set(x_35, 10, x_30);
+lean_ctor_set(x_35, 11, x_32);
+lean_ctor_set_uint8(x_35, sizeof(void*)*12, x_31);
+lean_ctor_set_uint8(x_35, sizeof(void*)*12 + 1, x_33);
 lean_inc(x_8);
 lean_inc(x_6);
 lean_inc(x_5);
@@ -2781,10 +2797,10 @@ lean_inc(x_4);
 lean_inc(x_3);
 lean_inc(x_2);
 lean_inc(x_1);
-x_34 = lean_apply_9(x_19, x_1, x_2, x_3, x_4, x_5, x_6, x_33, x_8, x_12);
-if (lean_obj_tag(x_34) == 0)
+x_36 = lean_apply_9(x_19, x_1, x_2, x_3, x_4, x_5, x_6, x_35, x_8, x_12);
+if (lean_obj_tag(x_36) == 0)
 {
-uint8_t x_35; 
+uint8_t x_37; 
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
@@ -2793,63 +2809,47 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_35 = !lean_is_exclusive(x_34);
-if (x_35 == 0)
+x_37 = !lean_is_exclusive(x_36);
+if (x_37 == 0)
 {
-lean_object* x_36; lean_object* x_37; 
-x_36 = lean_ctor_get(x_34, 0);
-lean_dec(x_36);
-x_37 = lean_box(0);
-lean_ctor_set(x_34, 0, x_37);
-return x_34;
-}
-else
-{
-lean_object* x_38; lean_object* x_39; lean_object* x_40; 
-x_38 = lean_ctor_get(x_34, 1);
-lean_inc(x_38);
-lean_dec(x_34);
+lean_object* x_38; lean_object* x_39; 
+x_38 = lean_ctor_get(x_36, 0);
+lean_dec(x_38);
 x_39 = lean_box(0);
-x_40 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_40, 0, x_39);
-lean_ctor_set(x_40, 1, x_38);
-return x_40;
+lean_ctor_set(x_36, 0, x_39);
+return x_36;
+}
+else
+{
+lean_object* x_40; lean_object* x_41; lean_object* x_42; 
+x_40 = lean_ctor_get(x_36, 1);
+lean_inc(x_40);
+lean_dec(x_36);
+x_41 = lean_box(0);
+x_42 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_42, 0, x_41);
+lean_ctor_set(x_42, 1, x_40);
+return x_42;
 }
 }
 else
 {
-uint8_t x_41; 
-x_41 = !lean_is_exclusive(x_34);
-if (x_41 == 0)
+uint8_t x_43; 
+x_43 = !lean_is_exclusive(x_36);
+if (x_43 == 0)
 {
-lean_object* x_42; lean_object* x_43; uint8_t x_44; 
-x_42 = lean_ctor_get(x_34, 0);
-x_43 = lean_ctor_get(x_34, 1);
-x_44 = l_Lean_Exception_isRuntime(x_42);
-if (x_44 == 0)
+lean_object* x_44; lean_object* x_45; uint8_t x_46; 
+x_44 = lean_ctor_get(x_36, 0);
+x_45 = lean_ctor_get(x_36, 1);
+x_46 = l_Lean_Exception_isInterrupt(x_44);
+if (x_46 == 0)
 {
-if (lean_obj_tag(x_42) == 0)
-{
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-lean_dec(x_1);
-return x_34;
-}
-else
-{
-lean_object* x_45; lean_object* x_46; uint8_t x_47; 
-x_45 = lean_ctor_get(x_42, 0);
-lean_inc(x_45);
-x_46 = l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Term_Quotation_precheck___spec__8___rarg___closed__1;
-x_47 = lean_nat_dec_eq(x_46, x_45);
-lean_dec(x_45);
+uint8_t x_47; 
+x_47 = l_Lean_Exception_isRuntime(x_44);
 if (x_47 == 0)
 {
+if (lean_obj_tag(x_44) == 0)
+{
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
@@ -2858,16 +2858,36 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-return x_34;
+return x_36;
 }
 else
 {
-lean_object* x_48; lean_object* x_49; 
-lean_free_object(x_34);
-lean_dec(x_42);
-x_48 = lean_box(0);
-x_49 = l_Lean_Elab_Term_Quotation_precheck___lambda__4(x_1, x_48, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_43);
-return x_49;
+lean_object* x_48; lean_object* x_49; uint8_t x_50; 
+x_48 = lean_ctor_get(x_44, 0);
+lean_inc(x_48);
+x_49 = l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Term_Quotation_precheck___spec__8___rarg___closed__1;
+x_50 = lean_nat_dec_eq(x_49, x_48);
+lean_dec(x_48);
+if (x_50 == 0)
+{
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+return x_36;
+}
+else
+{
+lean_object* x_51; lean_object* x_52; 
+lean_free_object(x_36);
+lean_dec(x_44);
+x_51 = lean_box(0);
+x_52 = l_Lean_Elab_Term_Quotation_precheck___lambda__4(x_1, x_51, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_45);
+return x_52;
 }
 }
 }
@@ -2881,23 +2901,11 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-return x_34;
+return x_36;
 }
 }
 else
 {
-lean_object* x_50; lean_object* x_51; uint8_t x_52; 
-x_50 = lean_ctor_get(x_34, 0);
-x_51 = lean_ctor_get(x_34, 1);
-lean_inc(x_51);
-lean_inc(x_50);
-lean_dec(x_34);
-x_52 = l_Lean_Exception_isRuntime(x_50);
-if (x_52 == 0)
-{
-if (lean_obj_tag(x_50) == 0)
-{
-lean_object* x_53; 
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
@@ -2906,21 +2914,26 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_53 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_53, 0, x_50);
-lean_ctor_set(x_53, 1, x_51);
-return x_53;
+return x_36;
+}
 }
 else
 {
-lean_object* x_54; lean_object* x_55; uint8_t x_56; 
-x_54 = lean_ctor_get(x_50, 0);
+lean_object* x_53; lean_object* x_54; uint8_t x_55; 
+x_53 = lean_ctor_get(x_36, 0);
+x_54 = lean_ctor_get(x_36, 1);
 lean_inc(x_54);
-x_55 = l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Term_Quotation_precheck___spec__8___rarg___closed__1;
-x_56 = lean_nat_dec_eq(x_55, x_54);
-lean_dec(x_54);
+lean_inc(x_53);
+lean_dec(x_36);
+x_55 = l_Lean_Exception_isInterrupt(x_53);
+if (x_55 == 0)
+{
+uint8_t x_56; 
+x_56 = l_Lean_Exception_isRuntime(x_53);
 if (x_56 == 0)
 {
+if (lean_obj_tag(x_53) == 0)
+{
 lean_object* x_57; 
 lean_dec(x_8);
 lean_dec(x_7);
@@ -2931,23 +2944,21 @@ lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
 x_57 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_57, 0, x_50);
-lean_ctor_set(x_57, 1, x_51);
+lean_ctor_set(x_57, 0, x_53);
+lean_ctor_set(x_57, 1, x_54);
 return x_57;
 }
 else
 {
-lean_object* x_58; lean_object* x_59; 
-lean_dec(x_50);
-x_58 = lean_box(0);
-x_59 = l_Lean_Elab_Term_Quotation_precheck___lambda__4(x_1, x_58, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_51);
-return x_59;
-}
-}
-}
-else
+lean_object* x_58; lean_object* x_59; uint8_t x_60; 
+x_58 = lean_ctor_get(x_53, 0);
+lean_inc(x_58);
+x_59 = l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Term_Quotation_precheck___spec__8___rarg___closed__1;
+x_60 = lean_nat_dec_eq(x_59, x_58);
+lean_dec(x_58);
+if (x_60 == 0)
 {
-lean_object* x_60; 
+lean_object* x_61; 
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
@@ -2956,10 +2967,53 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_60 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_60, 0, x_50);
-lean_ctor_set(x_60, 1, x_51);
-return x_60;
+x_61 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_61, 0, x_53);
+lean_ctor_set(x_61, 1, x_54);
+return x_61;
+}
+else
+{
+lean_object* x_62; lean_object* x_63; 
+lean_dec(x_53);
+x_62 = lean_box(0);
+x_63 = l_Lean_Elab_Term_Quotation_precheck___lambda__4(x_1, x_62, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_54);
+return x_63;
+}
+}
+}
+else
+{
+lean_object* x_64; 
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_64 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_64, 0, x_53);
+lean_ctor_set(x_64, 1, x_54);
+return x_64;
+}
+}
+else
+{
+lean_object* x_65; 
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_65 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_65, 0, x_53);
+lean_ctor_set(x_65, 1, x_54);
+return x_65;
 }
 }
 }
@@ -3605,13 +3659,17 @@ if (x_18 == 0)
 lean_object* x_19; lean_object* x_20; uint8_t x_21; 
 x_19 = lean_ctor_get(x_14, 0);
 x_20 = lean_ctor_get(x_14, 1);
-x_21 = l_Lean_Exception_isRuntime(x_19);
+x_21 = l_Lean_Exception_isInterrupt(x_19);
 if (x_21 == 0)
 {
-lean_object* x_22; 
+uint8_t x_22; 
+x_22 = l_Lean_Exception_isRuntime(x_19);
+if (x_22 == 0)
+{
+lean_object* x_23; 
 lean_free_object(x_14);
 lean_dec(x_19);
-x_22 = l_Lean_Elab_Term_Quotation_precheckIdent___lambda__2(x_1, x_12, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_20);
+x_23 = l_Lean_Elab_Term_Quotation_precheckIdent___lambda__2(x_1, x_12, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_20);
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
@@ -3619,7 +3677,7 @@ lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-return x_22;
+return x_23;
 }
 else
 {
@@ -3636,30 +3694,6 @@ return x_14;
 }
 else
 {
-lean_object* x_23; lean_object* x_24; uint8_t x_25; 
-x_23 = lean_ctor_get(x_14, 0);
-x_24 = lean_ctor_get(x_14, 1);
-lean_inc(x_24);
-lean_inc(x_23);
-lean_dec(x_14);
-x_25 = l_Lean_Exception_isRuntime(x_23);
-if (x_25 == 0)
-{
-lean_object* x_26; 
-lean_dec(x_23);
-x_26 = l_Lean_Elab_Term_Quotation_precheckIdent___lambda__2(x_1, x_12, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_24);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-return x_26;
-}
-else
-{
-lean_object* x_27; 
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
@@ -3668,10 +3702,68 @@ lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_1);
-x_27 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_27, 0, x_23);
-lean_ctor_set(x_27, 1, x_24);
-return x_27;
+return x_14;
+}
+}
+else
+{
+lean_object* x_24; lean_object* x_25; uint8_t x_26; 
+x_24 = lean_ctor_get(x_14, 0);
+x_25 = lean_ctor_get(x_14, 1);
+lean_inc(x_25);
+lean_inc(x_24);
+lean_dec(x_14);
+x_26 = l_Lean_Exception_isInterrupt(x_24);
+if (x_26 == 0)
+{
+uint8_t x_27; 
+x_27 = l_Lean_Exception_isRuntime(x_24);
+if (x_27 == 0)
+{
+lean_object* x_28; 
+lean_dec(x_24);
+x_28 = l_Lean_Elab_Term_Quotation_precheckIdent___lambda__2(x_1, x_12, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_25);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+return x_28;
+}
+else
+{
+lean_object* x_29; 
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_1);
+x_29 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_29, 0, x_24);
+lean_ctor_set(x_29, 1, x_25);
+return x_29;
+}
+}
+else
+{
+lean_object* x_30; 
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_1);
+x_30 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_30, 0, x_24);
+lean_ctor_set(x_30, 1, x_25);
+return x_30;
 }
 }
 }
@@ -4705,14 +4797,18 @@ if (x_18 == 0)
 {
 lean_object* x_19; uint8_t x_20; 
 x_19 = lean_ctor_get(x_10, 0);
-x_20 = l_Lean_Exception_isRuntime(x_19);
+x_20 = l_Lean_Exception_isInterrupt(x_19);
 if (x_20 == 0)
 {
-lean_object* x_21; 
-x_21 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_21, 0, x_19);
+uint8_t x_21; 
+x_21 = l_Lean_Exception_isRuntime(x_19);
+if (x_21 == 0)
+{
+lean_object* x_22; 
+x_22 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_22, 0, x_19);
 lean_ctor_set_tag(x_10, 0);
-lean_ctor_set(x_10, 0, x_21);
+lean_ctor_set(x_10, 0, x_22);
 return x_10;
 }
 else
@@ -4722,30 +4818,48 @@ return x_10;
 }
 else
 {
-lean_object* x_22; lean_object* x_23; uint8_t x_24; 
-x_22 = lean_ctor_get(x_10, 0);
-x_23 = lean_ctor_get(x_10, 1);
+return x_10;
+}
+}
+else
+{
+lean_object* x_23; lean_object* x_24; uint8_t x_25; 
+x_23 = lean_ctor_get(x_10, 0);
+x_24 = lean_ctor_get(x_10, 1);
+lean_inc(x_24);
 lean_inc(x_23);
-lean_inc(x_22);
 lean_dec(x_10);
-x_24 = l_Lean_Exception_isRuntime(x_22);
-if (x_24 == 0)
+x_25 = l_Lean_Exception_isInterrupt(x_23);
+if (x_25 == 0)
 {
-lean_object* x_25; lean_object* x_26; 
-x_25 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_25, 0, x_22);
-x_26 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_26, 0, x_25);
-lean_ctor_set(x_26, 1, x_23);
-return x_26;
+uint8_t x_26; 
+x_26 = l_Lean_Exception_isRuntime(x_23);
+if (x_26 == 0)
+{
+lean_object* x_27; lean_object* x_28; 
+x_27 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_27, 0, x_23);
+x_28 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_28, 0, x_27);
+lean_ctor_set(x_28, 1, x_24);
+return x_28;
 }
 else
 {
-lean_object* x_27; 
-x_27 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_27, 0, x_22);
-lean_ctor_set(x_27, 1, x_23);
-return x_27;
+lean_object* x_29; 
+x_29 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_29, 0, x_23);
+lean_ctor_set(x_29, 1, x_24);
+return x_29;
+}
+}
+else
+{
+lean_object* x_30; 
+x_30 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_30, 0, x_23);
+lean_ctor_set(x_30, 1, x_24);
+return x_30;
 }
 }
 }

stage0/stdlib/Lean/Elab/Quotation/Util.c

@@ -221,7 +221,7 @@ return x_13;
 }
 else
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; 
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; lean_object* x_26; uint8_t x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; 
 x_14 = lean_ctor_get(x_7, 0);
 x_15 = lean_ctor_get(x_7, 1);
 x_16 = lean_ctor_get(x_7, 2);
@@ -233,7 +233,10 @@ x_21 = lean_ctor_get(x_7, 7);
 x_22 = lean_ctor_get(x_7, 8);
 x_23 = lean_ctor_get(x_7, 9);
 x_24 = lean_ctor_get(x_7, 10);
-x_25 = lean_ctor_get_uint8(x_7, sizeof(void*)*11);
+x_25 = lean_ctor_get_uint8(x_7, sizeof(void*)*12);
+x_26 = lean_ctor_get(x_7, 11);
+x_27 = lean_ctor_get_uint8(x_7, sizeof(void*)*12 + 1);
+lean_inc(x_26);
 lean_inc(x_24);
 lean_inc(x_23);
 lean_inc(x_22);
@@ -246,24 +249,26 @@ lean_inc(x_16);
 lean_inc(x_15);
 lean_inc(x_14);
 lean_dec(x_7);
-x_26 = l_Lean_replaceRef(x_1, x_19);
+x_28 = l_Lean_replaceRef(x_1, x_19);
 lean_dec(x_19);
-x_27 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_27, 0, x_14);
-lean_ctor_set(x_27, 1, x_15);
-lean_ctor_set(x_27, 2, x_16);
-lean_ctor_set(x_27, 3, x_17);
-lean_ctor_set(x_27, 4, x_18);
-lean_ctor_set(x_27, 5, x_26);
-lean_ctor_set(x_27, 6, x_20);
-lean_ctor_set(x_27, 7, x_21);
-lean_ctor_set(x_27, 8, x_22);
-lean_ctor_set(x_27, 9, x_23);
-lean_ctor_set(x_27, 10, x_24);
-lean_ctor_set_uint8(x_27, sizeof(void*)*11, x_25);
-x_28 = l_Lean_throwError___at_Lean_Elab_Term_addAutoBoundImplicits_go___spec__50(x_2, x_3, x_4, x_5, x_6, x_27, x_8, x_9);
-lean_dec(x_27);
-return x_28;
+x_29 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_29, 0, x_14);
+lean_ctor_set(x_29, 1, x_15);
+lean_ctor_set(x_29, 2, x_16);
+lean_ctor_set(x_29, 3, x_17);
+lean_ctor_set(x_29, 4, x_18);
+lean_ctor_set(x_29, 5, x_28);
+lean_ctor_set(x_29, 6, x_20);
+lean_ctor_set(x_29, 7, x_21);
+lean_ctor_set(x_29, 8, x_22);
+lean_ctor_set(x_29, 9, x_23);
+lean_ctor_set(x_29, 10, x_24);
+lean_ctor_set(x_29, 11, x_26);
+lean_ctor_set_uint8(x_29, sizeof(void*)*12, x_25);
+lean_ctor_set_uint8(x_29, sizeof(void*)*12 + 1, x_27);
+x_30 = l_Lean_throwError___at_Lean_Elab_Term_addAutoBoundImplicits_go___spec__50(x_2, x_3, x_4, x_5, x_6, x_29, x_8, x_9);
+lean_dec(x_29);
+return x_30;
 }
 }
 }
@@ -1265,7 +1270,7 @@ return x_13;
 }
 else
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; 
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; lean_object* x_26; uint8_t x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; 
 x_14 = lean_ctor_get(x_7, 0);
 x_15 = lean_ctor_get(x_7, 1);
 x_16 = lean_ctor_get(x_7, 2);
@@ -1277,7 +1282,10 @@ x_21 = lean_ctor_get(x_7, 7);
 x_22 = lean_ctor_get(x_7, 8);
 x_23 = lean_ctor_get(x_7, 9);
 x_24 = lean_ctor_get(x_7, 10);
-x_25 = lean_ctor_get_uint8(x_7, sizeof(void*)*11);
+x_25 = lean_ctor_get_uint8(x_7, sizeof(void*)*12);
+x_26 = lean_ctor_get(x_7, 11);
+x_27 = lean_ctor_get_uint8(x_7, sizeof(void*)*12 + 1);
+lean_inc(x_26);
 lean_inc(x_24);
 lean_inc(x_23);
 lean_inc(x_22);
@@ -1290,29 +1298,31 @@ lean_inc(x_16);
 lean_inc(x_15);
 lean_inc(x_14);
 lean_dec(x_7);
-x_26 = l_Lean_replaceRef(x_1, x_19);
+x_28 = l_Lean_replaceRef(x_1, x_19);
 lean_dec(x_19);
 lean_dec(x_1);
-x_27 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_27, 0, x_14);
-lean_ctor_set(x_27, 1, x_15);
-lean_ctor_set(x_27, 2, x_16);
-lean_ctor_set(x_27, 3, x_17);
-lean_ctor_set(x_27, 4, x_18);
-lean_ctor_set(x_27, 5, x_26);
-lean_ctor_set(x_27, 6, x_20);
-lean_ctor_set(x_27, 7, x_21);
-lean_ctor_set(x_27, 8, x_22);
-lean_ctor_set(x_27, 9, x_23);
-lean_ctor_set(x_27, 10, x_24);
-lean_ctor_set_uint8(x_27, sizeof(void*)*11, x_25);
-x_28 = l_Lean_throwError___at_Lean_Elab_Term_Quotation_getPatternVars___spec__2(x_2, x_3, x_4, x_5, x_6, x_27, x_8, x_9);
+x_29 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_29, 0, x_14);
+lean_ctor_set(x_29, 1, x_15);
+lean_ctor_set(x_29, 2, x_16);
+lean_ctor_set(x_29, 3, x_17);
+lean_ctor_set(x_29, 4, x_18);
+lean_ctor_set(x_29, 5, x_28);
+lean_ctor_set(x_29, 6, x_20);
+lean_ctor_set(x_29, 7, x_21);
+lean_ctor_set(x_29, 8, x_22);
+lean_ctor_set(x_29, 9, x_23);
+lean_ctor_set(x_29, 10, x_24);
+lean_ctor_set(x_29, 11, x_26);
+lean_ctor_set_uint8(x_29, sizeof(void*)*12, x_25);
+lean_ctor_set_uint8(x_29, sizeof(void*)*12 + 1, x_27);
+x_30 = l_Lean_throwError___at_Lean_Elab_Term_Quotation_getPatternVars___spec__2(x_2, x_3, x_4, x_5, x_6, x_29, x_8, x_9);
 lean_dec(x_8);
-lean_dec(x_27);
+lean_dec(x_29);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-return x_28;
+return x_30;
 }
 }
 }

stage0/stdlib/Lean/Elab/Tactic/Cache.c

@@ -48,12 +48,14 @@ static lean_object* l_Lean_Elab_Tactic_initFn____x40_Lean_Elab_Tactic_Cache___hy
 static lean_object* l_Lean_Elab_Tactic_initFn____x40_Lean_Elab_Tactic_Cache___hyg_16____closed__9;
 static lean_object* l___private_Lean_Elab_Tactic_Cache_0__Lean_Elab_Tactic_dbg__cache___closed__2;
 lean_object* lean_st_ref_take(lean_object*, lean_object*);
+uint8_t l___private_Lean_Elab_Term_0__Lean_Elab_Tactic_beqCacheKey____x40_Lean_Elab_Term___hyg_658_(lean_object*, lean_object*);
 static lean_object* l___private_Lean_Elab_Tactic_Cache_0__Lean_Elab_Tactic_dbg__cache_x27___closed__2;
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Tactic_Cache_0__Lean_Elab_Tactic_findCache_x3f___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_expr_eqv(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Tactic_Cache_0__Lean_Elab_Tactic_dbg__cache_x27___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAux___at_Lean_Elab_Tactic_evalCheckpoint___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Elab_Tactic_initFn____x40_Lean_Elab_Tactic_Cache___hyg_16____closed__3;
+uint64_t l___private_Lean_Elab_Term_0__Lean_Elab_Tactic_hashCacheKey____x40_Lean_Elab_Term___hyg_735_(lean_object*);
 static lean_object* l_Lean_PersistentHashMap_insertAux___at_Lean_Elab_Tactic_evalCheckpoint___spec__2___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_tactic_dbg__cache;
 static size_t l_Lean_PersistentHashMap_findAux___at___private_Lean_Elab_Tactic_Cache_0__Lean_Elab_Tactic_dbg__cache_x27___spec__2___closed__1;
@@ -78,8 +80,6 @@ LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_initFn____x40_Lean_Elab_Tactic_Cache
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalCheckpoint_declRange___closed__2;
 static lean_object* l_Lean_Elab_Tactic_initFn____x40_Lean_Elab_Tactic_Cache___hyg_16____closed__7;
 static lean_object* l___private_Lean_Elab_Tactic_Cache_0__Lean_Elab_Tactic_dbg__cache___closed__1;
-uint64_t l___private_Lean_Elab_Term_0__Lean_Elab_Tactic_hashCacheKey____x40_Lean_Elab_Term___hyg_679_(lean_object*);
-uint8_t l___private_Lean_Elab_Term_0__Lean_Elab_Tactic_beqCacheKey____x40_Lean_Elab_Term___hyg_602_(lean_object*, lean_object*);
 lean_object* l_Lean_MVarId_getDecl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
 static size_t l_Lean_PersistentHashMap_findAux___at___private_Lean_Elab_Tactic_Cache_0__Lean_Elab_Tactic_dbg__cache_x27___spec__2___closed__2;
@@ -342,7 +342,7 @@ else
 {
 lean_object* x_9; uint8_t x_10; 
 x_9 = lean_array_fget(x_1, x_4);
-x_10 = l___private_Lean_Elab_Term_0__Lean_Elab_Tactic_beqCacheKey____x40_Lean_Elab_Term___hyg_602_(x_5, x_9);
+x_10 = l___private_Lean_Elab_Term_0__Lean_Elab_Tactic_beqCacheKey____x40_Lean_Elab_Term___hyg_658_(x_5, x_9);
 lean_dec(x_9);
 if (x_10 == 0)
 {
@@ -414,7 +414,7 @@ lean_inc(x_12);
 x_13 = lean_ctor_get(x_11, 1);
 lean_inc(x_13);
 lean_dec(x_11);
-x_14 = l___private_Lean_Elab_Term_0__Lean_Elab_Tactic_beqCacheKey____x40_Lean_Elab_Term___hyg_602_(x_3, x_12);
+x_14 = l___private_Lean_Elab_Term_0__Lean_Elab_Tactic_beqCacheKey____x40_Lean_Elab_Term___hyg_658_(x_3, x_12);
 lean_dec(x_12);
 if (x_14 == 0)
 {
@@ -475,7 +475,7 @@ lean_inc(x_27);
 x_28 = lean_ctor_get(x_26, 1);
 lean_inc(x_28);
 lean_dec(x_26);
-x_29 = l___private_Lean_Elab_Term_0__Lean_Elab_Tactic_beqCacheKey____x40_Lean_Elab_Term___hyg_602_(x_3, x_27);
+x_29 = l___private_Lean_Elab_Term_0__Lean_Elab_Tactic_beqCacheKey____x40_Lean_Elab_Term___hyg_658_(x_3, x_27);
 lean_dec(x_27);
 if (x_29 == 0)
 {
@@ -535,7 +535,7 @@ lean_object* x_3; uint64_t x_4; size_t x_5; lean_object* x_6;
 x_3 = lean_ctor_get(x_1, 0);
 lean_inc(x_3);
 lean_dec(x_1);
-x_4 = l___private_Lean_Elab_Term_0__Lean_Elab_Tactic_hashCacheKey____x40_Lean_Elab_Term___hyg_679_(x_2);
+x_4 = l___private_Lean_Elab_Term_0__Lean_Elab_Tactic_hashCacheKey____x40_Lean_Elab_Term___hyg_735_(x_2);
 x_5 = lean_uint64_to_usize(x_4);
 x_6 = l_Lean_PersistentHashMap_findAux___at___private_Lean_Elab_Tactic_Cache_0__Lean_Elab_Tactic_dbg__cache_x27___spec__2(x_3, x_5, x_2);
 lean_dec(x_2);
@@ -1816,7 +1816,7 @@ else
 lean_object* x_9; lean_object* x_10; uint64_t x_11; size_t x_12; size_t x_13; size_t x_14; size_t x_15; size_t x_16; size_t x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
 x_9 = lean_array_fget(x_2, x_5);
 x_10 = lean_array_fget(x_3, x_5);
-x_11 = l___private_Lean_Elab_Term_0__Lean_Elab_Tactic_hashCacheKey____x40_Lean_Elab_Term___hyg_679_(x_9);
+x_11 = l___private_Lean_Elab_Term_0__Lean_Elab_Tactic_hashCacheKey____x40_Lean_Elab_Term___hyg_735_(x_9);
 x_12 = lean_uint64_to_usize(x_11);
 x_13 = 1;
 x_14 = lean_usize_sub(x_1, x_13);
@@ -1879,7 +1879,7 @@ else
 {
 lean_object* x_17; uint8_t x_18; 
 x_17 = lean_array_fget(x_5, x_2);
-x_18 = l___private_Lean_Elab_Term_0__Lean_Elab_Tactic_beqCacheKey____x40_Lean_Elab_Term___hyg_602_(x_3, x_17);
+x_18 = l___private_Lean_Elab_Term_0__Lean_Elab_Tactic_beqCacheKey____x40_Lean_Elab_Term___hyg_658_(x_3, x_17);
 lean_dec(x_17);
 if (x_18 == 0)
 {
@@ -1976,7 +1976,7 @@ if (x_18 == 0)
 lean_object* x_19; lean_object* x_20; uint8_t x_21; 
 x_19 = lean_ctor_get(x_15, 0);
 x_20 = lean_ctor_get(x_15, 1);
-x_21 = l___private_Lean_Elab_Term_0__Lean_Elab_Tactic_beqCacheKey____x40_Lean_Elab_Term___hyg_602_(x_4, x_19);
+x_21 = l___private_Lean_Elab_Term_0__Lean_Elab_Tactic_beqCacheKey____x40_Lean_Elab_Term___hyg_658_(x_4, x_19);
 if (x_21 == 0)
 {
 lean_object* x_22; lean_object* x_23; lean_object* x_24; 
@@ -2010,7 +2010,7 @@ x_27 = lean_ctor_get(x_15, 1);
 lean_inc(x_27);
 lean_inc(x_26);
 lean_dec(x_15);
-x_28 = l___private_Lean_Elab_Term_0__Lean_Elab_Tactic_beqCacheKey____x40_Lean_Elab_Term___hyg_602_(x_4, x_26);
+x_28 = l___private_Lean_Elab_Term_0__Lean_Elab_Tactic_beqCacheKey____x40_Lean_Elab_Term___hyg_658_(x_4, x_26);
 if (x_28 == 0)
 {
 lean_object* x_29; lean_object* x_30; lean_object* x_31; 
@@ -2131,7 +2131,7 @@ if (lean_is_exclusive(x_57)) {
  lean_dec_ref(x_57);
  x_62 = lean_box(0);
 }
-x_63 = l___private_Lean_Elab_Term_0__Lean_Elab_Tactic_beqCacheKey____x40_Lean_Elab_Term___hyg_602_(x_4, x_60);
+x_63 = l___private_Lean_Elab_Term_0__Lean_Elab_Tactic_beqCacheKey____x40_Lean_Elab_Term___hyg_658_(x_4, x_60);
 if (x_63 == 0)
 {
 lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; 
@@ -2308,7 +2308,7 @@ if (x_4 == 0)
 lean_object* x_5; lean_object* x_6; uint64_t x_7; size_t x_8; size_t x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; 
 x_5 = lean_ctor_get(x_1, 0);
 x_6 = lean_ctor_get(x_1, 1);
-x_7 = l___private_Lean_Elab_Term_0__Lean_Elab_Tactic_hashCacheKey____x40_Lean_Elab_Term___hyg_679_(x_2);
+x_7 = l___private_Lean_Elab_Term_0__Lean_Elab_Tactic_hashCacheKey____x40_Lean_Elab_Term___hyg_735_(x_2);
 x_8 = lean_uint64_to_usize(x_7);
 x_9 = 1;
 x_10 = l_Lean_PersistentHashMap_insertAux___at_Lean_Elab_Tactic_evalCheckpoint___spec__2(x_5, x_8, x_9, x_2, x_3);
@@ -2327,7 +2327,7 @@ x_14 = lean_ctor_get(x_1, 1);
 lean_inc(x_14);
 lean_inc(x_13);
 lean_dec(x_1);
-x_15 = l___private_Lean_Elab_Term_0__Lean_Elab_Tactic_hashCacheKey____x40_Lean_Elab_Term___hyg_679_(x_2);
+x_15 = l___private_Lean_Elab_Term_0__Lean_Elab_Tactic_hashCacheKey____x40_Lean_Elab_Term___hyg_735_(x_2);
 x_16 = lean_uint64_to_usize(x_15);
 x_17 = 1;
 x_18 = l_Lean_PersistentHashMap_insertAux___at_Lean_Elab_Tactic_evalCheckpoint___spec__2(x_13, x_16, x_17, x_2, x_3);

stage0/stdlib/Lean/Elab/Tactic/Conv/Congr.c

@@ -18558,7 +18558,7 @@ return x_15;
 }
 else
 {
-lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; uint8_t x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; 
+lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; uint8_t x_30; lean_object* x_31; uint8_t x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; 
 lean_dec(x_4);
 x_16 = lean_array_uget(x_1, x_3);
 x_17 = l_Lean_Syntax_getId(x_16);
@@ -18575,9 +18575,12 @@ x_26 = lean_ctor_get(x_11, 7);
 x_27 = lean_ctor_get(x_11, 8);
 x_28 = lean_ctor_get(x_11, 9);
 x_29 = lean_ctor_get(x_11, 10);
-x_30 = lean_ctor_get_uint8(x_11, sizeof(void*)*11);
-x_31 = l_Lean_replaceRef(x_16, x_24);
+x_30 = lean_ctor_get_uint8(x_11, sizeof(void*)*12);
+x_31 = lean_ctor_get(x_11, 11);
+x_32 = lean_ctor_get_uint8(x_11, sizeof(void*)*12 + 1);
+x_33 = l_Lean_replaceRef(x_16, x_24);
 lean_dec(x_16);
+lean_inc(x_31);
 lean_inc(x_29);
 lean_inc(x_28);
 lean_inc(x_27);
@@ -18588,19 +18591,21 @@ lean_inc(x_22);
 lean_inc(x_21);
 lean_inc(x_20);
 lean_inc(x_19);
-x_32 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_32, 0, x_19);
-lean_ctor_set(x_32, 1, x_20);
-lean_ctor_set(x_32, 2, x_21);
-lean_ctor_set(x_32, 3, x_22);
-lean_ctor_set(x_32, 4, x_23);
-lean_ctor_set(x_32, 5, x_31);
-lean_ctor_set(x_32, 6, x_25);
-lean_ctor_set(x_32, 7, x_26);
-lean_ctor_set(x_32, 8, x_27);
-lean_ctor_set(x_32, 9, x_28);
-lean_ctor_set(x_32, 10, x_29);
-lean_ctor_set_uint8(x_32, sizeof(void*)*11, x_30);
+x_34 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_34, 0, x_19);
+lean_ctor_set(x_34, 1, x_20);
+lean_ctor_set(x_34, 2, x_21);
+lean_ctor_set(x_34, 3, x_22);
+lean_ctor_set(x_34, 4, x_23);
+lean_ctor_set(x_34, 5, x_33);
+lean_ctor_set(x_34, 6, x_25);
+lean_ctor_set(x_34, 7, x_26);
+lean_ctor_set(x_34, 8, x_27);
+lean_ctor_set(x_34, 9, x_28);
+lean_ctor_set(x_34, 10, x_29);
+lean_ctor_set(x_34, 11, x_31);
+lean_ctor_set_uint8(x_34, sizeof(void*)*12, x_30);
+lean_ctor_set_uint8(x_34, sizeof(void*)*12 + 1, x_32);
 lean_inc(x_12);
 lean_inc(x_10);
 lean_inc(x_9);
@@ -18608,24 +18613,24 @@ lean_inc(x_8);
 lean_inc(x_7);
 lean_inc(x_6);
 lean_inc(x_5);
-x_33 = l___private_Lean_Elab_Tactic_Conv_Congr_0__Lean_Elab_Tactic_Conv_ext(x_18, x_5, x_6, x_7, x_8, x_9, x_10, x_32, x_12, x_13);
-if (lean_obj_tag(x_33) == 0)
+x_35 = l___private_Lean_Elab_Tactic_Conv_Congr_0__Lean_Elab_Tactic_Conv_ext(x_18, x_5, x_6, x_7, x_8, x_9, x_10, x_34, x_12, x_13);
+if (lean_obj_tag(x_35) == 0)
 {
-lean_object* x_34; size_t x_35; size_t x_36; lean_object* x_37; 
-x_34 = lean_ctor_get(x_33, 1);
-lean_inc(x_34);
-lean_dec(x_33);
-x_35 = 1;
-x_36 = lean_usize_add(x_3, x_35);
-x_37 = lean_box(0);
-x_3 = x_36;
-x_4 = x_37;
-x_13 = x_34;
+lean_object* x_36; size_t x_37; size_t x_38; lean_object* x_39; 
+x_36 = lean_ctor_get(x_35, 1);
+lean_inc(x_36);
+lean_dec(x_35);
+x_37 = 1;
+x_38 = lean_usize_add(x_3, x_37);
+x_39 = lean_box(0);
+x_3 = x_38;
+x_4 = x_39;
+x_13 = x_36;
 goto _start;
 }
 else
 {
-uint8_t x_39; 
+uint8_t x_41; 
 lean_dec(x_12);
 lean_dec(x_10);
 lean_dec(x_9);
@@ -18633,23 +18638,23 @@ lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
-x_39 = !lean_is_exclusive(x_33);
-if (x_39 == 0)
+x_41 = !lean_is_exclusive(x_35);
+if (x_41 == 0)
 {
-return x_33;
+return x_35;
 }
 else
 {
-lean_object* x_40; lean_object* x_41; lean_object* x_42; 
-x_40 = lean_ctor_get(x_33, 0);
-x_41 = lean_ctor_get(x_33, 1);
-lean_inc(x_41);
-lean_inc(x_40);
-lean_dec(x_33);
-x_42 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_42, 0, x_40);
-lean_ctor_set(x_42, 1, x_41);
-return x_42;
+lean_object* x_42; lean_object* x_43; lean_object* x_44; 
+x_42 = lean_ctor_get(x_35, 0);
+x_43 = lean_ctor_get(x_35, 1);
+lean_inc(x_43);
+lean_inc(x_42);
+lean_dec(x_35);
+x_44 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_44, 0, x_42);
+lean_ctor_set(x_44, 1, x_43);
+return x_44;
 }
 }
 }

stage0/stdlib/Lean/Elab/Tactic/Conv/Pattern.c

@@ -2383,7 +2383,7 @@ return x_15;
 }
 else
 {
-lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; uint8_t x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; 
+lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; uint8_t x_27; lean_object* x_28; uint8_t x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; 
 x_16 = lean_ctor_get(x_9, 0);
 x_17 = lean_ctor_get(x_9, 1);
 x_18 = lean_ctor_get(x_9, 2);
@@ -2395,7 +2395,10 @@ x_23 = lean_ctor_get(x_9, 7);
 x_24 = lean_ctor_get(x_9, 8);
 x_25 = lean_ctor_get(x_9, 9);
 x_26 = lean_ctor_get(x_9, 10);
-x_27 = lean_ctor_get_uint8(x_9, sizeof(void*)*11);
+x_27 = lean_ctor_get_uint8(x_9, sizeof(void*)*12);
+x_28 = lean_ctor_get(x_9, 11);
+x_29 = lean_ctor_get_uint8(x_9, sizeof(void*)*12 + 1);
+lean_inc(x_28);
 lean_inc(x_26);
 lean_inc(x_25);
 lean_inc(x_24);
@@ -2408,32 +2411,34 @@ lean_inc(x_18);
 lean_inc(x_17);
 lean_inc(x_16);
 lean_dec(x_9);
-x_28 = l_Lean_replaceRef(x_1, x_21);
+x_30 = l_Lean_replaceRef(x_1, x_21);
 lean_dec(x_21);
 lean_dec(x_1);
-x_29 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_29, 0, x_16);
-lean_ctor_set(x_29, 1, x_17);
-lean_ctor_set(x_29, 2, x_18);
-lean_ctor_set(x_29, 3, x_19);
-lean_ctor_set(x_29, 4, x_20);
-lean_ctor_set(x_29, 5, x_28);
-lean_ctor_set(x_29, 6, x_22);
-lean_ctor_set(x_29, 7, x_23);
-lean_ctor_set(x_29, 8, x_24);
-lean_ctor_set(x_29, 9, x_25);
-lean_ctor_set(x_29, 10, x_26);
-lean_ctor_set_uint8(x_29, sizeof(void*)*11, x_27);
-x_30 = l_Lean_throwError___at_Lean_Elab_Tactic_Conv_evalPattern___spec__7(x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_29, x_10, x_11);
+x_31 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_31, 0, x_16);
+lean_ctor_set(x_31, 1, x_17);
+lean_ctor_set(x_31, 2, x_18);
+lean_ctor_set(x_31, 3, x_19);
+lean_ctor_set(x_31, 4, x_20);
+lean_ctor_set(x_31, 5, x_30);
+lean_ctor_set(x_31, 6, x_22);
+lean_ctor_set(x_31, 7, x_23);
+lean_ctor_set(x_31, 8, x_24);
+lean_ctor_set(x_31, 9, x_25);
+lean_ctor_set(x_31, 10, x_26);
+lean_ctor_set(x_31, 11, x_28);
+lean_ctor_set_uint8(x_31, sizeof(void*)*12, x_27);
+lean_ctor_set_uint8(x_31, sizeof(void*)*12 + 1, x_29);
+x_32 = l_Lean_throwError___at_Lean_Elab_Tactic_Conv_evalPattern___spec__7(x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_31, x_10, x_11);
 lean_dec(x_10);
-lean_dec(x_29);
+lean_dec(x_31);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-return x_30;
+return x_32;
 }
 }
 }
@@ -2731,7 +2736,7 @@ return x_13;
 }
 else
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; 
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; lean_object* x_26; uint8_t x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; 
 x_14 = lean_ctor_get(x_7, 0);
 x_15 = lean_ctor_get(x_7, 1);
 x_16 = lean_ctor_get(x_7, 2);
@@ -2743,7 +2748,10 @@ x_21 = lean_ctor_get(x_7, 7);
 x_22 = lean_ctor_get(x_7, 8);
 x_23 = lean_ctor_get(x_7, 9);
 x_24 = lean_ctor_get(x_7, 10);
-x_25 = lean_ctor_get_uint8(x_7, sizeof(void*)*11);
+x_25 = lean_ctor_get_uint8(x_7, sizeof(void*)*12);
+x_26 = lean_ctor_get(x_7, 11);
+x_27 = lean_ctor_get_uint8(x_7, sizeof(void*)*12 + 1);
+lean_inc(x_26);
 lean_inc(x_24);
 lean_inc(x_23);
 lean_inc(x_22);
@@ -2756,23 +2764,25 @@ lean_inc(x_16);
 lean_inc(x_15);
 lean_inc(x_14);
 lean_dec(x_7);
-x_26 = l_Lean_replaceRef(x_1, x_19);
+x_28 = l_Lean_replaceRef(x_1, x_19);
 lean_dec(x_19);
-x_27 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_27, 0, x_14);
-lean_ctor_set(x_27, 1, x_15);
-lean_ctor_set(x_27, 2, x_16);
-lean_ctor_set(x_27, 3, x_17);
-lean_ctor_set(x_27, 4, x_18);
-lean_ctor_set(x_27, 5, x_26);
-lean_ctor_set(x_27, 6, x_20);
-lean_ctor_set(x_27, 7, x_21);
-lean_ctor_set(x_27, 8, x_22);
-lean_ctor_set(x_27, 9, x_23);
-lean_ctor_set(x_27, 10, x_24);
-lean_ctor_set_uint8(x_27, sizeof(void*)*11, x_25);
-x_28 = l_Lean_Elab_Term_withoutErrToSorryImp___rarg(x_2, x_3, x_4, x_5, x_6, x_27, x_8, x_9);
-return x_28;
+x_29 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_29, 0, x_14);
+lean_ctor_set(x_29, 1, x_15);
+lean_ctor_set(x_29, 2, x_16);
+lean_ctor_set(x_29, 3, x_17);
+lean_ctor_set(x_29, 4, x_18);
+lean_ctor_set(x_29, 5, x_28);
+lean_ctor_set(x_29, 6, x_20);
+lean_ctor_set(x_29, 7, x_21);
+lean_ctor_set(x_29, 8, x_22);
+lean_ctor_set(x_29, 9, x_23);
+lean_ctor_set(x_29, 10, x_24);
+lean_ctor_set(x_29, 11, x_26);
+lean_ctor_set_uint8(x_29, sizeof(void*)*12, x_25);
+lean_ctor_set_uint8(x_29, sizeof(void*)*12 + 1, x_27);
+x_30 = l_Lean_Elab_Term_withoutErrToSorryImp___rarg(x_2, x_3, x_4, x_5, x_6, x_29, x_8, x_9);
+return x_30;
 }
 }
 }
@@ -4524,7 +4534,7 @@ return x_2;
 LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_Conv_evalPattern___lambda__11(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
 _start:
 {
-lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; uint8_t x_21; uint8_t x_22; uint8_t x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; uint8_t x_28; uint8_t x_29; uint8_t x_30; uint8_t x_31; lean_object* x_32; uint8_t x_33; uint8_t x_34; uint8_t x_35; lean_object* x_36; lean_object* x_37; 
+lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; uint8_t x_21; uint8_t x_22; uint8_t x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; uint8_t x_28; uint8_t x_29; uint8_t x_30; uint8_t x_31; lean_object* x_32; lean_object* x_33; uint8_t x_34; uint8_t x_35; uint8_t x_36; lean_object* x_37; lean_object* x_38; 
 lean_dec(x_2);
 x_13 = lean_unsigned_to_nat(2u);
 x_14 = l_Lean_Syntax_getArg(x_1, x_13);
@@ -4543,9 +4553,9 @@ x_19 = lean_ctor_get(x_6, 1);
 lean_inc(x_19);
 x_20 = lean_ctor_get(x_6, 2);
 lean_inc(x_20);
-x_21 = lean_ctor_get_uint8(x_6, sizeof(void*)*8);
-x_22 = lean_ctor_get_uint8(x_6, sizeof(void*)*8 + 1);
-x_23 = lean_ctor_get_uint8(x_6, sizeof(void*)*8 + 2);
+x_21 = lean_ctor_get_uint8(x_6, sizeof(void*)*9);
+x_22 = lean_ctor_get_uint8(x_6, sizeof(void*)*9 + 1);
+x_23 = lean_ctor_get_uint8(x_6, sizeof(void*)*9 + 2);
 x_24 = lean_ctor_get(x_6, 3);
 lean_inc(x_24);
 x_25 = lean_ctor_get(x_6, 4);
@@ -4554,48 +4564,51 @@ x_26 = lean_ctor_get(x_6, 5);
 lean_inc(x_26);
 x_27 = lean_ctor_get(x_6, 6);
 lean_inc(x_27);
-x_28 = lean_ctor_get_uint8(x_6, sizeof(void*)*8 + 3);
-x_29 = lean_ctor_get_uint8(x_6, sizeof(void*)*8 + 4);
-x_30 = lean_ctor_get_uint8(x_6, sizeof(void*)*8 + 5);
-x_31 = lean_ctor_get_uint8(x_6, sizeof(void*)*8 + 7);
+x_28 = lean_ctor_get_uint8(x_6, sizeof(void*)*9 + 3);
+x_29 = lean_ctor_get_uint8(x_6, sizeof(void*)*9 + 4);
+x_30 = lean_ctor_get_uint8(x_6, sizeof(void*)*9 + 5);
+x_31 = lean_ctor_get_uint8(x_6, sizeof(void*)*9 + 7);
 x_32 = lean_ctor_get(x_6, 7);
 lean_inc(x_32);
-x_33 = lean_ctor_get_uint8(x_6, sizeof(void*)*8 + 8);
-x_34 = lean_ctor_get_uint8(x_6, sizeof(void*)*8 + 9);
-x_35 = 1;
-x_36 = lean_alloc_ctor(0, 8, 10);
-lean_ctor_set(x_36, 0, x_18);
-lean_ctor_set(x_36, 1, x_19);
-lean_ctor_set(x_36, 2, x_20);
-lean_ctor_set(x_36, 3, x_24);
-lean_ctor_set(x_36, 4, x_25);
-lean_ctor_set(x_36, 5, x_26);
-lean_ctor_set(x_36, 6, x_27);
-lean_ctor_set(x_36, 7, x_32);
-lean_ctor_set_uint8(x_36, sizeof(void*)*8, x_21);
-lean_ctor_set_uint8(x_36, sizeof(void*)*8 + 1, x_22);
-lean_ctor_set_uint8(x_36, sizeof(void*)*8 + 2, x_23);
-lean_ctor_set_uint8(x_36, sizeof(void*)*8 + 3, x_28);
-lean_ctor_set_uint8(x_36, sizeof(void*)*8 + 4, x_29);
-lean_ctor_set_uint8(x_36, sizeof(void*)*8 + 5, x_30);
-lean_ctor_set_uint8(x_36, sizeof(void*)*8 + 6, x_35);
-lean_ctor_set_uint8(x_36, sizeof(void*)*8 + 7, x_31);
-lean_ctor_set_uint8(x_36, sizeof(void*)*8 + 8, x_33);
-lean_ctor_set_uint8(x_36, sizeof(void*)*8 + 9, x_34);
+x_33 = lean_ctor_get(x_6, 8);
+lean_inc(x_33);
+x_34 = lean_ctor_get_uint8(x_6, sizeof(void*)*9 + 8);
+x_35 = lean_ctor_get_uint8(x_6, sizeof(void*)*9 + 9);
+x_36 = 1;
+x_37 = lean_alloc_ctor(0, 9, 10);
+lean_ctor_set(x_37, 0, x_18);
+lean_ctor_set(x_37, 1, x_19);
+lean_ctor_set(x_37, 2, x_20);
+lean_ctor_set(x_37, 3, x_24);
+lean_ctor_set(x_37, 4, x_25);
+lean_ctor_set(x_37, 5, x_26);
+lean_ctor_set(x_37, 6, x_27);
+lean_ctor_set(x_37, 7, x_32);
+lean_ctor_set(x_37, 8, x_33);
+lean_ctor_set_uint8(x_37, sizeof(void*)*9, x_21);
+lean_ctor_set_uint8(x_37, sizeof(void*)*9 + 1, x_22);
+lean_ctor_set_uint8(x_37, sizeof(void*)*9 + 2, x_23);
+lean_ctor_set_uint8(x_37, sizeof(void*)*9 + 3, x_28);
+lean_ctor_set_uint8(x_37, sizeof(void*)*9 + 4, x_29);
+lean_ctor_set_uint8(x_37, sizeof(void*)*9 + 5, x_30);
+lean_ctor_set_uint8(x_37, sizeof(void*)*9 + 6, x_36);
+lean_ctor_set_uint8(x_37, sizeof(void*)*9 + 7, x_31);
+lean_ctor_set_uint8(x_37, sizeof(void*)*9 + 8, x_34);
+lean_ctor_set_uint8(x_37, sizeof(void*)*9 + 9, x_35);
 lean_inc(x_11);
 lean_inc(x_10);
 lean_inc(x_9);
 lean_inc(x_8);
 lean_inc(x_7);
-x_37 = l_Lean_Elab_Term_withoutModifyingElabMetaStateWithInfo___rarg(x_17, x_36, x_7, x_8, x_9, x_10, x_11, x_12);
-if (lean_obj_tag(x_37) == 0)
+x_38 = l_Lean_Elab_Term_withoutModifyingElabMetaStateWithInfo___rarg(x_17, x_37, x_7, x_8, x_9, x_10, x_11, x_12);
+if (lean_obj_tag(x_38) == 0)
 {
-lean_object* x_38; lean_object* x_39; lean_object* x_40; 
-x_38 = lean_ctor_get(x_37, 0);
-lean_inc(x_38);
-x_39 = lean_ctor_get(x_37, 1);
+lean_object* x_39; lean_object* x_40; lean_object* x_41; 
+x_39 = lean_ctor_get(x_38, 0);
 lean_inc(x_39);
-lean_dec(x_37);
+x_40 = lean_ctor_get(x_38, 1);
+lean_inc(x_40);
+lean_dec(x_38);
 lean_inc(x_11);
 lean_inc(x_10);
 lean_inc(x_9);
@@ -4604,54 +4617,54 @@ lean_inc(x_7);
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
-x_40 = l_Lean_Elab_Tactic_Conv_getLhs(x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_39);
-if (lean_obj_tag(x_40) == 0)
+x_41 = l_Lean_Elab_Tactic_Conv_getLhs(x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_40);
+if (lean_obj_tag(x_41) == 0)
 {
 if (lean_obj_tag(x_3) == 0)
 {
-lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; 
-x_41 = lean_ctor_get(x_40, 0);
-lean_inc(x_41);
-x_42 = lean_ctor_get(x_40, 1);
+lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; 
+x_42 = lean_ctor_get(x_41, 0);
 lean_inc(x_42);
-lean_dec(x_40);
-x_43 = l_Lean_Elab_Tactic_Conv_evalPattern___lambda__11___closed__3;
-x_44 = l_Lean_Elab_Tactic_Conv_evalPattern___lambda__9(x_38, x_15, x_41, x_43, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_42);
-return x_44;
+x_43 = lean_ctor_get(x_41, 1);
+lean_inc(x_43);
+lean_dec(x_41);
+x_44 = l_Lean_Elab_Tactic_Conv_evalPattern___lambda__11___closed__3;
+x_45 = l_Lean_Elab_Tactic_Conv_evalPattern___lambda__9(x_39, x_15, x_42, x_44, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_43);
+return x_45;
 }
 else
 {
-lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; uint8_t x_50; 
-x_45 = lean_ctor_get(x_40, 0);
-lean_inc(x_45);
-x_46 = lean_ctor_get(x_40, 1);
+lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; uint8_t x_51; 
+x_46 = lean_ctor_get(x_41, 0);
 lean_inc(x_46);
-lean_dec(x_40);
-x_47 = lean_ctor_get(x_3, 0);
+x_47 = lean_ctor_get(x_41, 1);
 lean_inc(x_47);
+lean_dec(x_41);
+x_48 = lean_ctor_get(x_3, 0);
+lean_inc(x_48);
 lean_dec(x_3);
-lean_inc(x_45);
-lean_inc(x_38);
-x_48 = lean_alloc_closure((void*)(l_Lean_Elab_Tactic_Conv_evalPattern___lambda__9), 13, 3);
-lean_closure_set(x_48, 0, x_38);
-lean_closure_set(x_48, 1, x_15);
-lean_closure_set(x_48, 2, x_45);
-x_49 = l_Lean_Elab_Tactic_Conv_evalPattern___lambda__11___closed__9;
-lean_inc(x_47);
-x_50 = l_Lean_Syntax_isOfKind(x_47, x_49);
-if (x_50 == 0)
+lean_inc(x_46);
+lean_inc(x_39);
+x_49 = lean_alloc_closure((void*)(l_Lean_Elab_Tactic_Conv_evalPattern___lambda__9), 13, 3);
+lean_closure_set(x_49, 0, x_39);
+lean_closure_set(x_49, 1, x_15);
+lean_closure_set(x_49, 2, x_46);
+x_50 = l_Lean_Elab_Tactic_Conv_evalPattern___lambda__11___closed__9;
+lean_inc(x_48);
+x_51 = l_Lean_Syntax_isOfKind(x_48, x_50);
+if (x_51 == 0)
 {
-lean_object* x_51; uint8_t x_52; 
-lean_dec(x_45);
-lean_dec(x_38);
-x_51 = l_Lean_Elab_Tactic_Conv_evalPattern___lambda__11___closed__11;
-lean_inc(x_47);
-x_52 = l_Lean_Syntax_isOfKind(x_47, x_51);
-if (x_52 == 0)
+lean_object* x_52; uint8_t x_53; 
+lean_dec(x_46);
+lean_dec(x_39);
+x_52 = l_Lean_Elab_Tactic_Conv_evalPattern___lambda__11___closed__11;
+lean_inc(x_48);
+x_53 = l_Lean_Syntax_isOfKind(x_48, x_52);
+if (x_53 == 0)
 {
-lean_object* x_53; uint8_t x_54; 
+lean_object* x_54; uint8_t x_55; 
+lean_dec(x_49);
 lean_dec(x_48);
-lean_dec(x_47);
 lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_9);
@@ -4660,36 +4673,36 @@ lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-x_53 = l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Tactic_Conv_evalPattern___spec__5___rarg(x_46);
-x_54 = !lean_is_exclusive(x_53);
-if (x_54 == 0)
+x_54 = l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Tactic_Conv_evalPattern___spec__5___rarg(x_47);
+x_55 = !lean_is_exclusive(x_54);
+if (x_55 == 0)
 {
-return x_53;
+return x_54;
 }
 else
 {
-lean_object* x_55; lean_object* x_56; lean_object* x_57; 
-x_55 = lean_ctor_get(x_53, 0);
-x_56 = lean_ctor_get(x_53, 1);
+lean_object* x_56; lean_object* x_57; lean_object* x_58; 
+x_56 = lean_ctor_get(x_54, 0);
+x_57 = lean_ctor_get(x_54, 1);
+lean_inc(x_57);
 lean_inc(x_56);
-lean_inc(x_55);
-lean_dec(x_53);
-x_57 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_57, 0, x_55);
-lean_ctor_set(x_57, 1, x_56);
-return x_57;
+lean_dec(x_54);
+x_58 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_58, 0, x_56);
+lean_ctor_set(x_58, 1, x_57);
+return x_58;
 }
 }
 else
 {
-lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; 
-x_58 = lean_unsigned_to_nat(0u);
-x_59 = l_Lean_Syntax_getArg(x_47, x_58);
-lean_dec(x_47);
-x_60 = l_Lean_Syntax_getArgs(x_59);
-lean_dec(x_59);
-x_61 = lean_array_get_size(x_60);
-x_62 = lean_mk_empty_array_with_capacity(x_61);
+lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; 
+x_59 = lean_unsigned_to_nat(0u);
+x_60 = l_Lean_Syntax_getArg(x_48, x_59);
+lean_dec(x_48);
+x_61 = l_Lean_Syntax_getArgs(x_60);
+lean_dec(x_60);
+x_62 = lean_array_get_size(x_61);
+x_63 = lean_mk_empty_array_with_capacity(x_62);
 lean_inc(x_11);
 lean_inc(x_10);
 lean_inc(x_9);
@@ -4698,30 +4711,30 @@ lean_inc(x_7);
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
-x_63 = l_Array_mapIdxM_map___at_Lean_Elab_Tactic_Conv_evalPattern___spec__8(x_60, x_60, x_61, x_58, lean_box(0), x_62, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_46);
-lean_dec(x_60);
-if (lean_obj_tag(x_63) == 0)
+x_64 = l_Array_mapIdxM_map___at_Lean_Elab_Tactic_Conv_evalPattern___spec__8(x_61, x_61, x_62, x_59, lean_box(0), x_63, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_47);
+lean_dec(x_61);
+if (lean_obj_tag(x_64) == 0)
 {
-lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; uint8_t x_70; 
-x_64 = lean_ctor_get(x_63, 0);
-lean_inc(x_64);
-x_65 = lean_ctor_get(x_63, 1);
+lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; uint8_t x_71; 
+x_65 = lean_ctor_get(x_64, 0);
 lean_inc(x_65);
-lean_dec(x_63);
-x_66 = lean_array_get_size(x_64);
-x_67 = lean_unsigned_to_nat(1u);
-x_68 = lean_nat_sub(x_66, x_67);
-lean_dec(x_66);
-x_69 = l_Array_qsort_sort___at_Lean_Elab_Tactic_Conv_evalPattern___spec__9(x_64, x_58, x_68);
-lean_dec(x_68);
-x_70 = l___private_Init_Data_Array_Basic_0__Array_allDiffAux___at_Lean_Elab_Tactic_Conv_evalPattern___spec__10(x_69, x_58);
-if (x_70 == 0)
-{
-lean_object* x_71; lean_object* x_72; uint8_t x_73; 
+x_66 = lean_ctor_get(x_64, 1);
+lean_inc(x_66);
+lean_dec(x_64);
+x_67 = lean_array_get_size(x_65);
+x_68 = lean_unsigned_to_nat(1u);
+x_69 = lean_nat_sub(x_67, x_68);
+lean_dec(x_67);
+x_70 = l_Array_qsort_sort___at_Lean_Elab_Tactic_Conv_evalPattern___spec__9(x_65, x_59, x_69);
 lean_dec(x_69);
-lean_dec(x_48);
-x_71 = l_Lean_Elab_Tactic_Conv_evalPattern___lambda__11___closed__13;
-x_72 = l_Lean_throwError___at_Lean_Elab_Tactic_evalTactic___spec__2(x_71, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_65);
+x_71 = l___private_Init_Data_Array_Basic_0__Array_allDiffAux___at_Lean_Elab_Tactic_Conv_evalPattern___spec__10(x_70, x_59);
+if (x_71 == 0)
+{
+lean_object* x_72; lean_object* x_73; uint8_t x_74; 
+lean_dec(x_70);
+lean_dec(x_49);
+x_72 = l_Lean_Elab_Tactic_Conv_evalPattern___lambda__11___closed__13;
+x_73 = l_Lean_throwError___at_Lean_Elab_Tactic_evalTactic___spec__2(x_72, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_66);
 lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_9);
@@ -4730,37 +4743,37 @@ lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-x_73 = !lean_is_exclusive(x_72);
-if (x_73 == 0)
+x_74 = !lean_is_exclusive(x_73);
+if (x_74 == 0)
 {
-return x_72;
+return x_73;
 }
 else
 {
-lean_object* x_74; lean_object* x_75; lean_object* x_76; 
-x_74 = lean_ctor_get(x_72, 0);
-x_75 = lean_ctor_get(x_72, 1);
+lean_object* x_75; lean_object* x_76; lean_object* x_77; 
+x_75 = lean_ctor_get(x_73, 0);
+x_76 = lean_ctor_get(x_73, 1);
+lean_inc(x_76);
 lean_inc(x_75);
-lean_inc(x_74);
-lean_dec(x_72);
-x_76 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_76, 0, x_74);
-lean_ctor_set(x_76, 1, x_75);
-return x_76;
+lean_dec(x_73);
+x_77 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_77, 0, x_75);
+lean_ctor_set(x_77, 1, x_76);
+return x_77;
 }
 }
 else
 {
-lean_object* x_77; lean_object* x_78; 
-x_77 = lean_box(0);
-x_78 = l_Lean_Elab_Tactic_Conv_evalPattern___lambda__10(x_69, x_48, x_77, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_65);
-return x_78;
+lean_object* x_78; lean_object* x_79; 
+x_78 = lean_box(0);
+x_79 = l_Lean_Elab_Tactic_Conv_evalPattern___lambda__10(x_70, x_49, x_78, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_66);
+return x_79;
 }
 }
 else
 {
-uint8_t x_79; 
-lean_dec(x_48);
+uint8_t x_80; 
+lean_dec(x_49);
 lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_9);
@@ -4769,42 +4782,42 @@ lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-x_79 = !lean_is_exclusive(x_63);
-if (x_79 == 0)
+x_80 = !lean_is_exclusive(x_64);
+if (x_80 == 0)
 {
-return x_63;
+return x_64;
 }
 else
 {
-lean_object* x_80; lean_object* x_81; lean_object* x_82; 
-x_80 = lean_ctor_get(x_63, 0);
-x_81 = lean_ctor_get(x_63, 1);
+lean_object* x_81; lean_object* x_82; lean_object* x_83; 
+x_81 = lean_ctor_get(x_64, 0);
+x_82 = lean_ctor_get(x_64, 1);
+lean_inc(x_82);
 lean_inc(x_81);
-lean_inc(x_80);
-lean_dec(x_63);
-x_82 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_82, 0, x_80);
-lean_ctor_set(x_82, 1, x_81);
-return x_82;
+lean_dec(x_64);
+x_83 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_83, 0, x_81);
+lean_ctor_set(x_83, 1, x_82);
+return x_83;
 }
 }
 }
 }
 else
 {
-lean_object* x_83; lean_object* x_84; 
+lean_object* x_84; lean_object* x_85; 
+lean_dec(x_49);
 lean_dec(x_48);
-lean_dec(x_47);
-x_83 = l_Lean_Elab_Tactic_Conv_evalPattern___lambda__11___closed__14;
-x_84 = l_Lean_Elab_Tactic_Conv_evalPattern___lambda__9(x_38, x_15, x_45, x_83, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_46);
-return x_84;
+x_84 = l_Lean_Elab_Tactic_Conv_evalPattern___lambda__11___closed__14;
+x_85 = l_Lean_Elab_Tactic_Conv_evalPattern___lambda__9(x_39, x_15, x_46, x_84, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_47);
+return x_85;
 }
 }
 }
 else
 {
-uint8_t x_85; 
-lean_dec(x_38);
+uint8_t x_86; 
+lean_dec(x_39);
 lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_9);
@@ -4814,29 +4827,29 @@ lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_85 = !lean_is_exclusive(x_40);
-if (x_85 == 0)
+x_86 = !lean_is_exclusive(x_41);
+if (x_86 == 0)
 {
-return x_40;
+return x_41;
 }
 else
 {
-lean_object* x_86; lean_object* x_87; lean_object* x_88; 
-x_86 = lean_ctor_get(x_40, 0);
-x_87 = lean_ctor_get(x_40, 1);
+lean_object* x_87; lean_object* x_88; lean_object* x_89; 
+x_87 = lean_ctor_get(x_41, 0);
+x_88 = lean_ctor_get(x_41, 1);
+lean_inc(x_88);
 lean_inc(x_87);
-lean_inc(x_86);
-lean_dec(x_40);
-x_88 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_88, 0, x_86);
-lean_ctor_set(x_88, 1, x_87);
-return x_88;
+lean_dec(x_41);
+x_89 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_89, 0, x_87);
+lean_ctor_set(x_89, 1, x_88);
+return x_89;
 }
 }
 }
 else
 {
-uint8_t x_89; 
+uint8_t x_90; 
 lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_9);
@@ -4846,23 +4859,23 @@ lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_89 = !lean_is_exclusive(x_37);
-if (x_89 == 0)
+x_90 = !lean_is_exclusive(x_38);
+if (x_90 == 0)
 {
-return x_37;
+return x_38;
 }
 else
 {
-lean_object* x_90; lean_object* x_91; lean_object* x_92; 
-x_90 = lean_ctor_get(x_37, 0);
-x_91 = lean_ctor_get(x_37, 1);
+lean_object* x_91; lean_object* x_92; lean_object* x_93; 
+x_91 = lean_ctor_get(x_38, 0);
+x_92 = lean_ctor_get(x_38, 1);
+lean_inc(x_92);
 lean_inc(x_91);
-lean_inc(x_90);
-lean_dec(x_37);
-x_92 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_92, 0, x_90);
-lean_ctor_set(x_92, 1, x_91);
-return x_92;
+lean_dec(x_38);
+x_93 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_93, 0, x_91);
+lean_ctor_set(x_93, 1, x_92);
+return x_93;
 }
 }
 }

stage0/stdlib/Lean/Elab/Tactic/ElabTerm.c

@@ -785,7 +785,7 @@ return x_27;
 }
 else
 {
-lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; uint8_t x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; 
+lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; uint8_t x_39; lean_object* x_40; uint8_t x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; 
 x_28 = lean_ctor_get(x_10, 0);
 x_29 = lean_ctor_get(x_10, 1);
 x_30 = lean_ctor_get(x_10, 2);
@@ -797,7 +797,10 @@ x_35 = lean_ctor_get(x_10, 7);
 x_36 = lean_ctor_get(x_10, 8);
 x_37 = lean_ctor_get(x_10, 9);
 x_38 = lean_ctor_get(x_10, 10);
-x_39 = lean_ctor_get_uint8(x_10, sizeof(void*)*11);
+x_39 = lean_ctor_get_uint8(x_10, sizeof(void*)*12);
+x_40 = lean_ctor_get(x_10, 11);
+x_41 = lean_ctor_get_uint8(x_10, sizeof(void*)*12 + 1);
+lean_inc(x_40);
 lean_inc(x_38);
 lean_inc(x_37);
 lean_inc(x_36);
@@ -810,54 +813,56 @@ lean_inc(x_30);
 lean_inc(x_29);
 lean_inc(x_28);
 lean_dec(x_10);
-x_40 = l_Lean_replaceRef(x_1, x_33);
+x_42 = l_Lean_replaceRef(x_1, x_33);
 lean_dec(x_33);
 lean_dec(x_1);
-x_41 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_41, 0, x_28);
-lean_ctor_set(x_41, 1, x_29);
-lean_ctor_set(x_41, 2, x_30);
-lean_ctor_set(x_41, 3, x_31);
-lean_ctor_set(x_41, 4, x_32);
-lean_ctor_set(x_41, 5, x_40);
-lean_ctor_set(x_41, 6, x_34);
-lean_ctor_set(x_41, 7, x_35);
-lean_ctor_set(x_41, 8, x_36);
-lean_ctor_set(x_41, 9, x_37);
-lean_ctor_set(x_41, 10, x_38);
-lean_ctor_set_uint8(x_41, sizeof(void*)*11, x_39);
+x_43 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_43, 0, x_28);
+lean_ctor_set(x_43, 1, x_29);
+lean_ctor_set(x_43, 2, x_30);
+lean_ctor_set(x_43, 3, x_31);
+lean_ctor_set(x_43, 4, x_32);
+lean_ctor_set(x_43, 5, x_42);
+lean_ctor_set(x_43, 6, x_34);
+lean_ctor_set(x_43, 7, x_35);
+lean_ctor_set(x_43, 8, x_36);
+lean_ctor_set(x_43, 9, x_37);
+lean_ctor_set(x_43, 10, x_38);
+lean_ctor_set(x_43, 11, x_40);
+lean_ctor_set_uint8(x_43, sizeof(void*)*12, x_39);
+lean_ctor_set_uint8(x_43, sizeof(void*)*12 + 1, x_41);
 lean_inc(x_11);
-lean_inc(x_41);
+lean_inc(x_43);
 lean_inc(x_9);
 lean_inc(x_8);
 lean_inc(x_7);
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
-x_42 = l_Lean_Elab_Tactic_runTermElab___rarg(x_16, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_41, x_11, x_12);
-if (lean_obj_tag(x_42) == 0)
+x_44 = l_Lean_Elab_Tactic_runTermElab___rarg(x_16, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_43, x_11, x_12);
+if (lean_obj_tag(x_44) == 0)
 {
-lean_object* x_43; lean_object* x_44; lean_object* x_45; 
-x_43 = lean_ctor_get(x_42, 0);
-lean_inc(x_43);
-x_44 = lean_ctor_get(x_42, 1);
-lean_inc(x_44);
-lean_dec(x_42);
-x_45 = l_Lean_instantiateMVars___at_Lean_Elab_Tactic_getMainTarget___spec__1(x_43, x_4, x_5, x_6, x_7, x_8, x_9, x_41, x_11, x_44);
+lean_object* x_45; lean_object* x_46; lean_object* x_47; 
+x_45 = lean_ctor_get(x_44, 0);
+lean_inc(x_45);
+x_46 = lean_ctor_get(x_44, 1);
+lean_inc(x_46);
+lean_dec(x_44);
+x_47 = l_Lean_instantiateMVars___at_Lean_Elab_Tactic_getMainTarget___spec__1(x_45, x_4, x_5, x_6, x_7, x_8, x_9, x_43, x_11, x_46);
 lean_dec(x_11);
-lean_dec(x_41);
+lean_dec(x_43);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-return x_45;
+return x_47;
 }
 else
 {
-lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; 
-lean_dec(x_41);
+lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; 
+lean_dec(x_43);
 lean_dec(x_11);
 lean_dec(x_9);
 lean_dec(x_8);
@@ -865,26 +870,26 @@ lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-x_46 = lean_ctor_get(x_42, 0);
-lean_inc(x_46);
-x_47 = lean_ctor_get(x_42, 1);
-lean_inc(x_47);
-if (lean_is_exclusive(x_42)) {
- lean_ctor_release(x_42, 0);
- lean_ctor_release(x_42, 1);
- x_48 = x_42;
+x_48 = lean_ctor_get(x_44, 0);
+lean_inc(x_48);
+x_49 = lean_ctor_get(x_44, 1);
+lean_inc(x_49);
+if (lean_is_exclusive(x_44)) {
+ lean_ctor_release(x_44, 0);
+ lean_ctor_release(x_44, 1);
+ x_50 = x_44;
 } else {
- lean_dec_ref(x_42);
- x_48 = lean_box(0);
+ lean_dec_ref(x_44);
+ x_50 = lean_box(0);
 }
-if (lean_is_scalar(x_48)) {
- x_49 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_50)) {
+ x_51 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_49 = x_48;
+ x_51 = x_50;
 }
-lean_ctor_set(x_49, 0, x_46);
-lean_ctor_set(x_49, 1, x_47);
-return x_49;
+lean_ctor_set(x_51, 0, x_48);
+lean_ctor_set(x_51, 1, x_49);
+return x_51;
 }
 }
 }
@@ -3401,7 +3406,7 @@ x_16 = !lean_is_exclusive(x_8);
 if (x_16 == 0)
 {
 uint8_t x_17; lean_object* x_18; uint8_t x_19; 
-x_17 = lean_ctor_get_uint8(x_6, sizeof(void*)*8 + 9);
+x_17 = lean_ctor_get_uint8(x_6, sizeof(void*)*9 + 9);
 x_18 = lean_ctor_get(x_8, 0);
 lean_dec(x_18);
 x_19 = !lean_is_exclusive(x_14);
@@ -3413,7 +3418,7 @@ lean_ctor_set_uint8(x_14, 7, x_20);
 if (x_17 == 0)
 {
 lean_object* x_21; 
-lean_ctor_set_uint8(x_6, sizeof(void*)*8 + 9, x_3);
+lean_ctor_set_uint8(x_6, sizeof(void*)*9 + 9, x_3);
 x_21 = l_Lean_Elab_Tactic_withCollectingNewGoalsFrom_go(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12);
 if (lean_obj_tag(x_21) == 0)
 {
@@ -3463,7 +3468,7 @@ return x_29;
 else
 {
 lean_object* x_30; 
-lean_ctor_set_uint8(x_6, sizeof(void*)*8 + 9, x_20);
+lean_ctor_set_uint8(x_6, sizeof(void*)*9 + 9, x_20);
 x_30 = l_Lean_Elab_Tactic_withCollectingNewGoalsFrom_go(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12);
 if (lean_obj_tag(x_30) == 0)
 {
@@ -3546,7 +3551,7 @@ lean_ctor_set(x_8, 0, x_52);
 if (x_17 == 0)
 {
 lean_object* x_53; 
-lean_ctor_set_uint8(x_6, sizeof(void*)*8 + 9, x_3);
+lean_ctor_set_uint8(x_6, sizeof(void*)*9 + 9, x_3);
 x_53 = l_Lean_Elab_Tactic_withCollectingNewGoalsFrom_go(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12);
 if (lean_obj_tag(x_53) == 0)
 {
@@ -3600,7 +3605,7 @@ return x_61;
 else
 {
 lean_object* x_62; 
-lean_ctor_set_uint8(x_6, sizeof(void*)*8 + 9, x_51);
+lean_ctor_set_uint8(x_6, sizeof(void*)*9 + 9, x_51);
 x_62 = l_Lean_Elab_Tactic_withCollectingNewGoalsFrom_go(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12);
 if (lean_obj_tag(x_62) == 0)
 {
@@ -3656,7 +3661,7 @@ return x_70;
 else
 {
 uint8_t x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; uint8_t x_77; uint8_t x_78; uint8_t x_79; uint8_t x_80; uint8_t x_81; uint8_t x_82; uint8_t x_83; uint8_t x_84; uint8_t x_85; uint8_t x_86; uint8_t x_87; uint8_t x_88; uint8_t x_89; uint8_t x_90; lean_object* x_91; uint8_t x_92; lean_object* x_93; lean_object* x_94; 
-x_71 = lean_ctor_get_uint8(x_6, sizeof(void*)*8 + 9);
+x_71 = lean_ctor_get_uint8(x_6, sizeof(void*)*9 + 9);
 x_72 = lean_ctor_get(x_8, 1);
 x_73 = lean_ctor_get(x_8, 2);
 x_74 = lean_ctor_get(x_8, 3);
@@ -3719,7 +3724,7 @@ lean_ctor_set_uint8(x_94, sizeof(void*)*6 + 1, x_78);
 if (x_71 == 0)
 {
 lean_object* x_95; 
-lean_ctor_set_uint8(x_6, sizeof(void*)*8 + 9, x_3);
+lean_ctor_set_uint8(x_6, sizeof(void*)*9 + 9, x_3);
 x_95 = l_Lean_Elab_Tactic_withCollectingNewGoalsFrom_go(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_94, x_9, x_10, x_11, x_12);
 if (lean_obj_tag(x_95) == 0)
 {
@@ -3773,7 +3778,7 @@ return x_103;
 else
 {
 lean_object* x_104; 
-lean_ctor_set_uint8(x_6, sizeof(void*)*8 + 9, x_92);
+lean_ctor_set_uint8(x_6, sizeof(void*)*9 + 9, x_92);
 x_104 = l_Lean_Elab_Tactic_withCollectingNewGoalsFrom_go(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_94, x_9, x_10, x_11, x_12);
 if (lean_obj_tag(x_104) == 0)
 {
@@ -3828,25 +3833,27 @@ return x_112;
 }
 else
 {
-lean_object* x_113; lean_object* x_114; lean_object* x_115; uint8_t x_116; uint8_t x_117; uint8_t x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; uint8_t x_123; uint8_t x_124; uint8_t x_125; uint8_t x_126; uint8_t x_127; lean_object* x_128; uint8_t x_129; uint8_t x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; uint8_t x_136; uint8_t x_137; lean_object* x_138; uint8_t x_139; uint8_t x_140; uint8_t x_141; uint8_t x_142; uint8_t x_143; uint8_t x_144; uint8_t x_145; uint8_t x_146; uint8_t x_147; uint8_t x_148; uint8_t x_149; uint8_t x_150; lean_object* x_151; uint8_t x_152; lean_object* x_153; lean_object* x_154; 
+lean_object* x_113; lean_object* x_114; lean_object* x_115; uint8_t x_116; uint8_t x_117; uint8_t x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; uint8_t x_123; uint8_t x_124; uint8_t x_125; uint8_t x_126; uint8_t x_127; lean_object* x_128; lean_object* x_129; uint8_t x_130; uint8_t x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_136; uint8_t x_137; uint8_t x_138; lean_object* x_139; uint8_t x_140; uint8_t x_141; uint8_t x_142; uint8_t x_143; uint8_t x_144; uint8_t x_145; uint8_t x_146; uint8_t x_147; uint8_t x_148; uint8_t x_149; uint8_t x_150; uint8_t x_151; lean_object* x_152; uint8_t x_153; lean_object* x_154; lean_object* x_155; 
 x_113 = lean_ctor_get(x_6, 0);
 x_114 = lean_ctor_get(x_6, 1);
 x_115 = lean_ctor_get(x_6, 2);
-x_116 = lean_ctor_get_uint8(x_6, sizeof(void*)*8);
-x_117 = lean_ctor_get_uint8(x_6, sizeof(void*)*8 + 1);
-x_118 = lean_ctor_get_uint8(x_6, sizeof(void*)*8 + 2);
+x_116 = lean_ctor_get_uint8(x_6, sizeof(void*)*9);
+x_117 = lean_ctor_get_uint8(x_6, sizeof(void*)*9 + 1);
+x_118 = lean_ctor_get_uint8(x_6, sizeof(void*)*9 + 2);
 x_119 = lean_ctor_get(x_6, 3);
 x_120 = lean_ctor_get(x_6, 4);
 x_121 = lean_ctor_get(x_6, 5);
 x_122 = lean_ctor_get(x_6, 6);
-x_123 = lean_ctor_get_uint8(x_6, sizeof(void*)*8 + 3);
-x_124 = lean_ctor_get_uint8(x_6, sizeof(void*)*8 + 4);
-x_125 = lean_ctor_get_uint8(x_6, sizeof(void*)*8 + 5);
-x_126 = lean_ctor_get_uint8(x_6, sizeof(void*)*8 + 6);
-x_127 = lean_ctor_get_uint8(x_6, sizeof(void*)*8 + 7);
+x_123 = lean_ctor_get_uint8(x_6, sizeof(void*)*9 + 3);
+x_124 = lean_ctor_get_uint8(x_6, sizeof(void*)*9 + 4);
+x_125 = lean_ctor_get_uint8(x_6, sizeof(void*)*9 + 5);
+x_126 = lean_ctor_get_uint8(x_6, sizeof(void*)*9 + 6);
+x_127 = lean_ctor_get_uint8(x_6, sizeof(void*)*9 + 7);
 x_128 = lean_ctor_get(x_6, 7);
-x_129 = lean_ctor_get_uint8(x_6, sizeof(void*)*8 + 8);
-x_130 = lean_ctor_get_uint8(x_6, sizeof(void*)*8 + 9);
+x_129 = lean_ctor_get(x_6, 8);
+x_130 = lean_ctor_get_uint8(x_6, sizeof(void*)*9 + 8);
+x_131 = lean_ctor_get_uint8(x_6, sizeof(void*)*9 + 9);
+lean_inc(x_129);
 lean_inc(x_128);
 lean_inc(x_122);
 lean_inc(x_121);
@@ -3856,18 +3863,18 @@ lean_inc(x_115);
 lean_inc(x_114);
 lean_inc(x_113);
 lean_dec(x_6);
-x_131 = lean_ctor_get(x_8, 1);
-lean_inc(x_131);
-x_132 = lean_ctor_get(x_8, 2);
+x_132 = lean_ctor_get(x_8, 1);
 lean_inc(x_132);
-x_133 = lean_ctor_get(x_8, 3);
+x_133 = lean_ctor_get(x_8, 2);
 lean_inc(x_133);
-x_134 = lean_ctor_get(x_8, 4);
+x_134 = lean_ctor_get(x_8, 3);
 lean_inc(x_134);
-x_135 = lean_ctor_get(x_8, 5);
+x_135 = lean_ctor_get(x_8, 4);
 lean_inc(x_135);
-x_136 = lean_ctor_get_uint8(x_8, sizeof(void*)*6);
-x_137 = lean_ctor_get_uint8(x_8, sizeof(void*)*6 + 1);
+x_136 = lean_ctor_get(x_8, 5);
+lean_inc(x_136);
+x_137 = lean_ctor_get_uint8(x_8, sizeof(void*)*6);
+x_138 = lean_ctor_get_uint8(x_8, sizeof(void*)*6 + 1);
 if (lean_is_exclusive(x_8)) {
  lean_ctor_release(x_8, 0);
  lean_ctor_release(x_8, 1);
@@ -3875,203 +3882,205 @@ if (lean_is_exclusive(x_8)) {
  lean_ctor_release(x_8, 3);
  lean_ctor_release(x_8, 4);
  lean_ctor_release(x_8, 5);
- x_138 = x_8;
+ x_139 = x_8;
 } else {
  lean_dec_ref(x_8);
- x_138 = lean_box(0);
+ x_139 = lean_box(0);
 }
-x_139 = lean_ctor_get_uint8(x_14, 0);
-x_140 = lean_ctor_get_uint8(x_14, 1);
-x_141 = lean_ctor_get_uint8(x_14, 2);
-x_142 = lean_ctor_get_uint8(x_14, 3);
-x_143 = lean_ctor_get_uint8(x_14, 4);
-x_144 = lean_ctor_get_uint8(x_14, 5);
-x_145 = lean_ctor_get_uint8(x_14, 6);
-x_146 = lean_ctor_get_uint8(x_14, 8);
-x_147 = lean_ctor_get_uint8(x_14, 9);
-x_148 = lean_ctor_get_uint8(x_14, 10);
-x_149 = lean_ctor_get_uint8(x_14, 11);
-x_150 = lean_ctor_get_uint8(x_14, 12);
+x_140 = lean_ctor_get_uint8(x_14, 0);
+x_141 = lean_ctor_get_uint8(x_14, 1);
+x_142 = lean_ctor_get_uint8(x_14, 2);
+x_143 = lean_ctor_get_uint8(x_14, 3);
+x_144 = lean_ctor_get_uint8(x_14, 4);
+x_145 = lean_ctor_get_uint8(x_14, 5);
+x_146 = lean_ctor_get_uint8(x_14, 6);
+x_147 = lean_ctor_get_uint8(x_14, 8);
+x_148 = lean_ctor_get_uint8(x_14, 9);
+x_149 = lean_ctor_get_uint8(x_14, 10);
+x_150 = lean_ctor_get_uint8(x_14, 11);
+x_151 = lean_ctor_get_uint8(x_14, 12);
 if (lean_is_exclusive(x_14)) {
- x_151 = x_14;
+ x_152 = x_14;
 } else {
  lean_dec_ref(x_14);
- x_151 = lean_box(0);
+ x_152 = lean_box(0);
 }
-x_152 = 1;
-if (lean_is_scalar(x_151)) {
- x_153 = lean_alloc_ctor(0, 0, 13);
+x_153 = 1;
+if (lean_is_scalar(x_152)) {
+ x_154 = lean_alloc_ctor(0, 0, 13);
 } else {
- x_153 = x_151;
+ x_154 = x_152;
 }
-lean_ctor_set_uint8(x_153, 0, x_139);
-lean_ctor_set_uint8(x_153, 1, x_140);
-lean_ctor_set_uint8(x_153, 2, x_141);
-lean_ctor_set_uint8(x_153, 3, x_142);
-lean_ctor_set_uint8(x_153, 4, x_143);
-lean_ctor_set_uint8(x_153, 5, x_144);
-lean_ctor_set_uint8(x_153, 6, x_145);
-lean_ctor_set_uint8(x_153, 7, x_152);
-lean_ctor_set_uint8(x_153, 8, x_146);
-lean_ctor_set_uint8(x_153, 9, x_147);
-lean_ctor_set_uint8(x_153, 10, x_148);
-lean_ctor_set_uint8(x_153, 11, x_149);
-lean_ctor_set_uint8(x_153, 12, x_150);
-if (lean_is_scalar(x_138)) {
- x_154 = lean_alloc_ctor(0, 6, 2);
+lean_ctor_set_uint8(x_154, 0, x_140);
+lean_ctor_set_uint8(x_154, 1, x_141);
+lean_ctor_set_uint8(x_154, 2, x_142);
+lean_ctor_set_uint8(x_154, 3, x_143);
+lean_ctor_set_uint8(x_154, 4, x_144);
+lean_ctor_set_uint8(x_154, 5, x_145);
+lean_ctor_set_uint8(x_154, 6, x_146);
+lean_ctor_set_uint8(x_154, 7, x_153);
+lean_ctor_set_uint8(x_154, 8, x_147);
+lean_ctor_set_uint8(x_154, 9, x_148);
+lean_ctor_set_uint8(x_154, 10, x_149);
+lean_ctor_set_uint8(x_154, 11, x_150);
+lean_ctor_set_uint8(x_154, 12, x_151);
+if (lean_is_scalar(x_139)) {
+ x_155 = lean_alloc_ctor(0, 6, 2);
 } else {
- x_154 = x_138;
+ x_155 = x_139;
 }
-lean_ctor_set(x_154, 0, x_153);
-lean_ctor_set(x_154, 1, x_131);
-lean_ctor_set(x_154, 2, x_132);
-lean_ctor_set(x_154, 3, x_133);
-lean_ctor_set(x_154, 4, x_134);
-lean_ctor_set(x_154, 5, x_135);
-lean_ctor_set_uint8(x_154, sizeof(void*)*6, x_136);
-lean_ctor_set_uint8(x_154, sizeof(void*)*6 + 1, x_137);
-if (x_130 == 0)
+lean_ctor_set(x_155, 0, x_154);
+lean_ctor_set(x_155, 1, x_132);
+lean_ctor_set(x_155, 2, x_133);
+lean_ctor_set(x_155, 3, x_134);
+lean_ctor_set(x_155, 4, x_135);
+lean_ctor_set(x_155, 5, x_136);
+lean_ctor_set_uint8(x_155, sizeof(void*)*6, x_137);
+lean_ctor_set_uint8(x_155, sizeof(void*)*6 + 1, x_138);
+if (x_131 == 0)
 {
-lean_object* x_155; lean_object* x_156; 
-x_155 = lean_alloc_ctor(0, 8, 10);
-lean_ctor_set(x_155, 0, x_113);
-lean_ctor_set(x_155, 1, x_114);
-lean_ctor_set(x_155, 2, x_115);
-lean_ctor_set(x_155, 3, x_119);
-lean_ctor_set(x_155, 4, x_120);
-lean_ctor_set(x_155, 5, x_121);
-lean_ctor_set(x_155, 6, x_122);
-lean_ctor_set(x_155, 7, x_128);
-lean_ctor_set_uint8(x_155, sizeof(void*)*8, x_116);
-lean_ctor_set_uint8(x_155, sizeof(void*)*8 + 1, x_117);
-lean_ctor_set_uint8(x_155, sizeof(void*)*8 + 2, x_118);
-lean_ctor_set_uint8(x_155, sizeof(void*)*8 + 3, x_123);
-lean_ctor_set_uint8(x_155, sizeof(void*)*8 + 4, x_124);
-lean_ctor_set_uint8(x_155, sizeof(void*)*8 + 5, x_125);
-lean_ctor_set_uint8(x_155, sizeof(void*)*8 + 6, x_126);
-lean_ctor_set_uint8(x_155, sizeof(void*)*8 + 7, x_127);
-lean_ctor_set_uint8(x_155, sizeof(void*)*8 + 8, x_129);
-lean_ctor_set_uint8(x_155, sizeof(void*)*8 + 9, x_3);
-x_156 = l_Lean_Elab_Tactic_withCollectingNewGoalsFrom_go(x_1, x_2, x_3, x_4, x_5, x_155, x_7, x_154, x_9, x_10, x_11, x_12);
-if (lean_obj_tag(x_156) == 0)
+lean_object* x_156; lean_object* x_157; 
+x_156 = lean_alloc_ctor(0, 9, 10);
+lean_ctor_set(x_156, 0, x_113);
+lean_ctor_set(x_156, 1, x_114);
+lean_ctor_set(x_156, 2, x_115);
+lean_ctor_set(x_156, 3, x_119);
+lean_ctor_set(x_156, 4, x_120);
+lean_ctor_set(x_156, 5, x_121);
+lean_ctor_set(x_156, 6, x_122);
+lean_ctor_set(x_156, 7, x_128);
+lean_ctor_set(x_156, 8, x_129);
+lean_ctor_set_uint8(x_156, sizeof(void*)*9, x_116);
+lean_ctor_set_uint8(x_156, sizeof(void*)*9 + 1, x_117);
+lean_ctor_set_uint8(x_156, sizeof(void*)*9 + 2, x_118);
+lean_ctor_set_uint8(x_156, sizeof(void*)*9 + 3, x_123);
+lean_ctor_set_uint8(x_156, sizeof(void*)*9 + 4, x_124);
+lean_ctor_set_uint8(x_156, sizeof(void*)*9 + 5, x_125);
+lean_ctor_set_uint8(x_156, sizeof(void*)*9 + 6, x_126);
+lean_ctor_set_uint8(x_156, sizeof(void*)*9 + 7, x_127);
+lean_ctor_set_uint8(x_156, sizeof(void*)*9 + 8, x_130);
+lean_ctor_set_uint8(x_156, sizeof(void*)*9 + 9, x_3);
+x_157 = l_Lean_Elab_Tactic_withCollectingNewGoalsFrom_go(x_1, x_2, x_3, x_4, x_5, x_156, x_7, x_155, x_9, x_10, x_11, x_12);
+if (lean_obj_tag(x_157) == 0)
 {
-lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; 
-x_157 = lean_ctor_get(x_156, 0);
-lean_inc(x_157);
-x_158 = lean_ctor_get(x_156, 1);
+lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; 
+x_158 = lean_ctor_get(x_157, 0);
 lean_inc(x_158);
-if (lean_is_exclusive(x_156)) {
- lean_ctor_release(x_156, 0);
- lean_ctor_release(x_156, 1);
- x_159 = x_156;
+x_159 = lean_ctor_get(x_157, 1);
+lean_inc(x_159);
+if (lean_is_exclusive(x_157)) {
+ lean_ctor_release(x_157, 0);
+ lean_ctor_release(x_157, 1);
+ x_160 = x_157;
 } else {
- lean_dec_ref(x_156);
- x_159 = lean_box(0);
+ lean_dec_ref(x_157);
+ x_160 = lean_box(0);
 }
-if (lean_is_scalar(x_159)) {
- x_160 = lean_alloc_ctor(0, 2, 0);
+if (lean_is_scalar(x_160)) {
+ x_161 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_160 = x_159;
+ x_161 = x_160;
 }
-lean_ctor_set(x_160, 0, x_157);
-lean_ctor_set(x_160, 1, x_158);
-return x_160;
+lean_ctor_set(x_161, 0, x_158);
+lean_ctor_set(x_161, 1, x_159);
+return x_161;
 }
 else
 {
-lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; 
-x_161 = lean_ctor_get(x_156, 0);
-lean_inc(x_161);
-x_162 = lean_ctor_get(x_156, 1);
+lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; 
+x_162 = lean_ctor_get(x_157, 0);
 lean_inc(x_162);
-if (lean_is_exclusive(x_156)) {
- lean_ctor_release(x_156, 0);
- lean_ctor_release(x_156, 1);
- x_163 = x_156;
+x_163 = lean_ctor_get(x_157, 1);
+lean_inc(x_163);
+if (lean_is_exclusive(x_157)) {
+ lean_ctor_release(x_157, 0);
+ lean_ctor_release(x_157, 1);
+ x_164 = x_157;
 } else {
- lean_dec_ref(x_156);
- x_163 = lean_box(0);
+ lean_dec_ref(x_157);
+ x_164 = lean_box(0);
 }
-if (lean_is_scalar(x_163)) {
- x_164 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_164)) {
+ x_165 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_164 = x_163;
+ x_165 = x_164;
 }
-lean_ctor_set(x_164, 0, x_161);
-lean_ctor_set(x_164, 1, x_162);
-return x_164;
+lean_ctor_set(x_165, 0, x_162);
+lean_ctor_set(x_165, 1, x_163);
+return x_165;
 }
 }
 else
 {
-lean_object* x_165; lean_object* x_166; 
-x_165 = lean_alloc_ctor(0, 8, 10);
-lean_ctor_set(x_165, 0, x_113);
-lean_ctor_set(x_165, 1, x_114);
-lean_ctor_set(x_165, 2, x_115);
-lean_ctor_set(x_165, 3, x_119);
-lean_ctor_set(x_165, 4, x_120);
-lean_ctor_set(x_165, 5, x_121);
-lean_ctor_set(x_165, 6, x_122);
-lean_ctor_set(x_165, 7, x_128);
-lean_ctor_set_uint8(x_165, sizeof(void*)*8, x_116);
-lean_ctor_set_uint8(x_165, sizeof(void*)*8 + 1, x_117);
-lean_ctor_set_uint8(x_165, sizeof(void*)*8 + 2, x_118);
-lean_ctor_set_uint8(x_165, sizeof(void*)*8 + 3, x_123);
-lean_ctor_set_uint8(x_165, sizeof(void*)*8 + 4, x_124);
-lean_ctor_set_uint8(x_165, sizeof(void*)*8 + 5, x_125);
-lean_ctor_set_uint8(x_165, sizeof(void*)*8 + 6, x_126);
-lean_ctor_set_uint8(x_165, sizeof(void*)*8 + 7, x_127);
-lean_ctor_set_uint8(x_165, sizeof(void*)*8 + 8, x_129);
-lean_ctor_set_uint8(x_165, sizeof(void*)*8 + 9, x_152);
-x_166 = l_Lean_Elab_Tactic_withCollectingNewGoalsFrom_go(x_1, x_2, x_3, x_4, x_5, x_165, x_7, x_154, x_9, x_10, x_11, x_12);
-if (lean_obj_tag(x_166) == 0)
+lean_object* x_166; lean_object* x_167; 
+x_166 = lean_alloc_ctor(0, 9, 10);
+lean_ctor_set(x_166, 0, x_113);
+lean_ctor_set(x_166, 1, x_114);
+lean_ctor_set(x_166, 2, x_115);
+lean_ctor_set(x_166, 3, x_119);
+lean_ctor_set(x_166, 4, x_120);
+lean_ctor_set(x_166, 5, x_121);
+lean_ctor_set(x_166, 6, x_122);
+lean_ctor_set(x_166, 7, x_128);
+lean_ctor_set(x_166, 8, x_129);
+lean_ctor_set_uint8(x_166, sizeof(void*)*9, x_116);
+lean_ctor_set_uint8(x_166, sizeof(void*)*9 + 1, x_117);
+lean_ctor_set_uint8(x_166, sizeof(void*)*9 + 2, x_118);
+lean_ctor_set_uint8(x_166, sizeof(void*)*9 + 3, x_123);
+lean_ctor_set_uint8(x_166, sizeof(void*)*9 + 4, x_124);
+lean_ctor_set_uint8(x_166, sizeof(void*)*9 + 5, x_125);
+lean_ctor_set_uint8(x_166, sizeof(void*)*9 + 6, x_126);
+lean_ctor_set_uint8(x_166, sizeof(void*)*9 + 7, x_127);
+lean_ctor_set_uint8(x_166, sizeof(void*)*9 + 8, x_130);
+lean_ctor_set_uint8(x_166, sizeof(void*)*9 + 9, x_153);
+x_167 = l_Lean_Elab_Tactic_withCollectingNewGoalsFrom_go(x_1, x_2, x_3, x_4, x_5, x_166, x_7, x_155, x_9, x_10, x_11, x_12);
+if (lean_obj_tag(x_167) == 0)
 {
-lean_object* x_167; lean_object* x_168; lean_object* x_169; lean_object* x_170; 
-x_167 = lean_ctor_get(x_166, 0);
-lean_inc(x_167);
-x_168 = lean_ctor_get(x_166, 1);
+lean_object* x_168; lean_object* x_169; lean_object* x_170; lean_object* x_171; 
+x_168 = lean_ctor_get(x_167, 0);
 lean_inc(x_168);
-if (lean_is_exclusive(x_166)) {
- lean_ctor_release(x_166, 0);
- lean_ctor_release(x_166, 1);
- x_169 = x_166;
+x_169 = lean_ctor_get(x_167, 1);
+lean_inc(x_169);
+if (lean_is_exclusive(x_167)) {
+ lean_ctor_release(x_167, 0);
+ lean_ctor_release(x_167, 1);
+ x_170 = x_167;
 } else {
- lean_dec_ref(x_166);
- x_169 = lean_box(0);
+ lean_dec_ref(x_167);
+ x_170 = lean_box(0);
 }
-if (lean_is_scalar(x_169)) {
- x_170 = lean_alloc_ctor(0, 2, 0);
+if (lean_is_scalar(x_170)) {
+ x_171 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_170 = x_169;
+ x_171 = x_170;
 }
-lean_ctor_set(x_170, 0, x_167);
-lean_ctor_set(x_170, 1, x_168);
-return x_170;
+lean_ctor_set(x_171, 0, x_168);
+lean_ctor_set(x_171, 1, x_169);
+return x_171;
 }
 else
 {
-lean_object* x_171; lean_object* x_172; lean_object* x_173; lean_object* x_174; 
-x_171 = lean_ctor_get(x_166, 0);
-lean_inc(x_171);
-x_172 = lean_ctor_get(x_166, 1);
+lean_object* x_172; lean_object* x_173; lean_object* x_174; lean_object* x_175; 
+x_172 = lean_ctor_get(x_167, 0);
 lean_inc(x_172);
-if (lean_is_exclusive(x_166)) {
- lean_ctor_release(x_166, 0);
- lean_ctor_release(x_166, 1);
- x_173 = x_166;
+x_173 = lean_ctor_get(x_167, 1);
+lean_inc(x_173);
+if (lean_is_exclusive(x_167)) {
+ lean_ctor_release(x_167, 0);
+ lean_ctor_release(x_167, 1);
+ x_174 = x_167;
 } else {
- lean_dec_ref(x_166);
- x_173 = lean_box(0);
+ lean_dec_ref(x_167);
+ x_174 = lean_box(0);
 }
-if (lean_is_scalar(x_173)) {
- x_174 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_174)) {
+ x_175 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_174 = x_173;
+ x_175 = x_174;
 }
-lean_ctor_set(x_174, 0, x_171);
-lean_ctor_set(x_174, 1, x_172);
-return x_174;
+lean_ctor_set(x_175, 0, x_172);
+lean_ctor_set(x_175, 1, x_173);
+return x_175;
 }
 }
 }
@@ -6211,7 +6220,7 @@ return x_35;
 }
 else
 {
-lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; uint8_t x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; 
+lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; uint8_t x_47; lean_object* x_48; uint8_t x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; 
 x_36 = lean_ctor_get(x_8, 0);
 x_37 = lean_ctor_get(x_8, 1);
 x_38 = lean_ctor_get(x_8, 2);
@@ -6223,7 +6232,10 @@ x_43 = lean_ctor_get(x_8, 7);
 x_44 = lean_ctor_get(x_8, 8);
 x_45 = lean_ctor_get(x_8, 9);
 x_46 = lean_ctor_get(x_8, 10);
-x_47 = lean_ctor_get_uint8(x_8, sizeof(void*)*11);
+x_47 = lean_ctor_get_uint8(x_8, sizeof(void*)*12);
+x_48 = lean_ctor_get(x_8, 11);
+x_49 = lean_ctor_get_uint8(x_8, sizeof(void*)*12 + 1);
+lean_inc(x_48);
 lean_inc(x_46);
 lean_inc(x_45);
 lean_inc(x_44);
@@ -6236,100 +6248,102 @@ lean_inc(x_38);
 lean_inc(x_37);
 lean_inc(x_36);
 lean_dec(x_8);
-x_48 = l_Lean_replaceRef(x_1, x_41);
+x_50 = l_Lean_replaceRef(x_1, x_41);
 lean_dec(x_41);
 lean_dec(x_1);
-x_49 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_49, 0, x_36);
-lean_ctor_set(x_49, 1, x_37);
-lean_ctor_set(x_49, 2, x_38);
-lean_ctor_set(x_49, 3, x_39);
-lean_ctor_set(x_49, 4, x_40);
-lean_ctor_set(x_49, 5, x_48);
-lean_ctor_set(x_49, 6, x_42);
-lean_ctor_set(x_49, 7, x_43);
-lean_ctor_set(x_49, 8, x_44);
-lean_ctor_set(x_49, 9, x_45);
-lean_ctor_set(x_49, 10, x_46);
-lean_ctor_set_uint8(x_49, sizeof(void*)*11, x_47);
+x_51 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_51, 0, x_36);
+lean_ctor_set(x_51, 1, x_37);
+lean_ctor_set(x_51, 2, x_38);
+lean_ctor_set(x_51, 3, x_39);
+lean_ctor_set(x_51, 4, x_40);
+lean_ctor_set(x_51, 5, x_50);
+lean_ctor_set(x_51, 6, x_42);
+lean_ctor_set(x_51, 7, x_43);
+lean_ctor_set(x_51, 8, x_44);
+lean_ctor_set(x_51, 9, x_45);
+lean_ctor_set(x_51, 10, x_46);
+lean_ctor_set(x_51, 11, x_48);
+lean_ctor_set_uint8(x_51, sizeof(void*)*12, x_47);
+lean_ctor_set_uint8(x_51, sizeof(void*)*12 + 1, x_49);
 lean_inc(x_9);
-lean_inc(x_49);
+lean_inc(x_51);
 lean_inc(x_7);
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_3);
 lean_inc(x_2);
-x_50 = l_Lean_Elab_Tactic_withMainContext___rarg(x_13, x_2, x_3, x_4, x_5, x_6, x_7, x_49, x_9, x_10);
-if (lean_obj_tag(x_50) == 0)
+x_52 = l_Lean_Elab_Tactic_withMainContext___rarg(x_13, x_2, x_3, x_4, x_5, x_6, x_7, x_51, x_9, x_10);
+if (lean_obj_tag(x_52) == 0)
 {
-lean_object* x_51; 
-x_51 = lean_ctor_get(x_50, 0);
-lean_inc(x_51);
-if (lean_obj_tag(x_51) == 1)
+lean_object* x_53; 
+x_53 = lean_ctor_get(x_52, 0);
+lean_inc(x_53);
+if (lean_obj_tag(x_53) == 1)
 {
-lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; 
-lean_dec(x_49);
-lean_dec(x_9);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-x_52 = lean_ctor_get(x_50, 1);
-lean_inc(x_52);
-if (lean_is_exclusive(x_50)) {
- lean_ctor_release(x_50, 0);
- lean_ctor_release(x_50, 1);
- x_53 = x_50;
-} else {
- lean_dec_ref(x_50);
- x_53 = lean_box(0);
-}
-x_54 = lean_ctor_get(x_51, 0);
-lean_inc(x_54);
+lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; 
 lean_dec(x_51);
-if (lean_is_scalar(x_53)) {
- x_55 = lean_alloc_ctor(0, 2, 0);
+lean_dec(x_9);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_54 = lean_ctor_get(x_52, 1);
+lean_inc(x_54);
+if (lean_is_exclusive(x_52)) {
+ lean_ctor_release(x_52, 0);
+ lean_ctor_release(x_52, 1);
+ x_55 = x_52;
 } else {
- x_55 = x_53;
+ lean_dec_ref(x_52);
+ x_55 = lean_box(0);
 }
-lean_ctor_set(x_55, 0, x_54);
-lean_ctor_set(x_55, 1, x_52);
-return x_55;
-}
-else
-{
-lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; 
-x_56 = lean_ctor_get(x_50, 1);
+x_56 = lean_ctor_get(x_53, 0);
 lean_inc(x_56);
-lean_dec(x_50);
-x_57 = l_Lean_MessageData_ofExpr(x_51);
-x_58 = l_Lean_Elab_Tactic_getFVarId___closed__2;
-x_59 = lean_alloc_ctor(6, 2, 0);
-lean_ctor_set(x_59, 0, x_58);
-lean_ctor_set(x_59, 1, x_57);
-x_60 = l_Lean_Elab_Tactic_getFVarId___closed__4;
+lean_dec(x_53);
+if (lean_is_scalar(x_55)) {
+ x_57 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_57 = x_55;
+}
+lean_ctor_set(x_57, 0, x_56);
+lean_ctor_set(x_57, 1, x_54);
+return x_57;
+}
+else
+{
+lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; 
+x_58 = lean_ctor_get(x_52, 1);
+lean_inc(x_58);
+lean_dec(x_52);
+x_59 = l_Lean_MessageData_ofExpr(x_53);
+x_60 = l_Lean_Elab_Tactic_getFVarId___closed__2;
 x_61 = lean_alloc_ctor(6, 2, 0);
-lean_ctor_set(x_61, 0, x_59);
-lean_ctor_set(x_61, 1, x_60);
-x_62 = l_Lean_throwError___at_Lean_Elab_Tactic_getFVarId___spec__1(x_61, x_2, x_3, x_4, x_5, x_6, x_7, x_49, x_9, x_56);
+lean_ctor_set(x_61, 0, x_60);
+lean_ctor_set(x_61, 1, x_59);
+x_62 = l_Lean_Elab_Tactic_getFVarId___closed__4;
+x_63 = lean_alloc_ctor(6, 2, 0);
+lean_ctor_set(x_63, 0, x_61);
+lean_ctor_set(x_63, 1, x_62);
+x_64 = l_Lean_throwError___at_Lean_Elab_Tactic_getFVarId___spec__1(x_63, x_2, x_3, x_4, x_5, x_6, x_7, x_51, x_9, x_58);
 lean_dec(x_9);
-lean_dec(x_49);
+lean_dec(x_51);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-return x_62;
+return x_64;
 }
 }
 else
 {
-lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; 
-lean_dec(x_49);
+lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; 
+lean_dec(x_51);
 lean_dec(x_9);
 lean_dec(x_7);
 lean_dec(x_6);
@@ -6337,26 +6351,26 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_63 = lean_ctor_get(x_50, 0);
-lean_inc(x_63);
-x_64 = lean_ctor_get(x_50, 1);
-lean_inc(x_64);
-if (lean_is_exclusive(x_50)) {
- lean_ctor_release(x_50, 0);
- lean_ctor_release(x_50, 1);
- x_65 = x_50;
+x_65 = lean_ctor_get(x_52, 0);
+lean_inc(x_65);
+x_66 = lean_ctor_get(x_52, 1);
+lean_inc(x_66);
+if (lean_is_exclusive(x_52)) {
+ lean_ctor_release(x_52, 0);
+ lean_ctor_release(x_52, 1);
+ x_67 = x_52;
 } else {
- lean_dec_ref(x_50);
- x_65 = lean_box(0);
+ lean_dec_ref(x_52);
+ x_67 = lean_box(0);
 }
-if (lean_is_scalar(x_65)) {
- x_66 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_67)) {
+ x_68 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_66 = x_65;
+ x_68 = x_67;
 }
-lean_ctor_set(x_66, 0, x_63);
-lean_ctor_set(x_66, 1, x_64);
-return x_66;
+lean_ctor_set(x_68, 0, x_65);
+lean_ctor_set(x_68, 1, x_66);
+return x_68;
 }
 }
 }

stage0/stdlib/Lean/Elab/Tactic/Ext.c

@@ -72,6 +72,7 @@ uint8_t lean_usize_dec_le(size_t, size_t);
 static lean_object* l_Lean_Elab_Tactic_Ext_withExtHyps___rarg___closed__2;
 static lean_object* l___private_Lean_Elab_Tactic_Ext_0__Lean_Elab_Tactic_Ext_reprExtTheorem____x40_Lean_Elab_Tactic_Ext___hyg_43____closed__6;
 LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_Ext_evalApplyExtTheorem___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+uint8_t l_Lean_Exception_isInterrupt(lean_object*);
 static lean_object* l_Lean_Linter_logLint___at_Lean_Elab_Tactic_Ext_evalExt___spec__3___closed__5;
 uint64_t lean_uint64_of_nat(lean_object*);
 uint64_t lean_uint64_mix_hash(uint64_t, uint64_t);
@@ -4229,7 +4230,7 @@ return x_12;
 }
 else
 {
-lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; 
+lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; uint8_t x_22; lean_object* x_23; lean_object* x_24; 
 x_13 = lean_ctor_get(x_3, 0);
 x_14 = lean_ctor_get(x_3, 1);
 x_15 = lean_ctor_get(x_3, 2);
@@ -4238,6 +4239,9 @@ x_17 = lean_ctor_get(x_3, 4);
 x_18 = lean_ctor_get(x_3, 5);
 x_19 = lean_ctor_get(x_3, 7);
 x_20 = lean_ctor_get(x_3, 8);
+x_21 = lean_ctor_get(x_3, 9);
+x_22 = lean_ctor_get_uint8(x_3, sizeof(void*)*10);
+lean_inc(x_21);
 lean_inc(x_20);
 lean_inc(x_19);
 lean_inc(x_18);
@@ -4247,19 +4251,21 @@ lean_inc(x_15);
 lean_inc(x_14);
 lean_inc(x_13);
 lean_dec(x_3);
-x_21 = lean_alloc_ctor(0, 9, 0);
-lean_ctor_set(x_21, 0, x_13);
-lean_ctor_set(x_21, 1, x_14);
-lean_ctor_set(x_21, 2, x_15);
-lean_ctor_set(x_21, 3, x_16);
-lean_ctor_set(x_21, 4, x_17);
-lean_ctor_set(x_21, 5, x_18);
-lean_ctor_set(x_21, 6, x_9);
-lean_ctor_set(x_21, 7, x_19);
-lean_ctor_set(x_21, 8, x_20);
-x_22 = l_Lean_throwError___at_Lean_Elab_Tactic_Ext_initFn____x40_Lean_Elab_Tactic_Ext___hyg_614____spec__3(x_2, x_21, x_4, x_8);
+x_23 = lean_alloc_ctor(0, 10, 1);
+lean_ctor_set(x_23, 0, x_13);
+lean_ctor_set(x_23, 1, x_14);
+lean_ctor_set(x_23, 2, x_15);
+lean_ctor_set(x_23, 3, x_16);
+lean_ctor_set(x_23, 4, x_17);
+lean_ctor_set(x_23, 5, x_18);
+lean_ctor_set(x_23, 6, x_9);
+lean_ctor_set(x_23, 7, x_19);
+lean_ctor_set(x_23, 8, x_20);
+lean_ctor_set(x_23, 9, x_21);
+lean_ctor_set_uint8(x_23, sizeof(void*)*10, x_22);
+x_24 = l_Lean_throwError___at_Lean_Elab_Tactic_Ext_initFn____x40_Lean_Elab_Tactic_Ext___hyg_614____spec__3(x_2, x_23, x_4, x_8);
 lean_dec(x_4);
-return x_22;
+return x_24;
 }
 }
 }
@@ -5304,7 +5310,7 @@ return x_11;
 }
 else
 {
-lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; uint8_t x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; 
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; uint8_t x_23; lean_object* x_24; uint8_t x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; 
 x_12 = lean_ctor_get(x_5, 0);
 x_13 = lean_ctor_get(x_5, 1);
 x_14 = lean_ctor_get(x_5, 2);
@@ -5316,7 +5322,10 @@ x_19 = lean_ctor_get(x_5, 7);
 x_20 = lean_ctor_get(x_5, 8);
 x_21 = lean_ctor_get(x_5, 9);
 x_22 = lean_ctor_get(x_5, 10);
-x_23 = lean_ctor_get_uint8(x_5, sizeof(void*)*11);
+x_23 = lean_ctor_get_uint8(x_5, sizeof(void*)*12);
+x_24 = lean_ctor_get(x_5, 11);
+x_25 = lean_ctor_get_uint8(x_5, sizeof(void*)*12 + 1);
+lean_inc(x_24);
 lean_inc(x_22);
 lean_inc(x_21);
 lean_inc(x_20);
@@ -5329,24 +5338,26 @@ lean_inc(x_14);
 lean_inc(x_13);
 lean_inc(x_12);
 lean_dec(x_5);
-x_24 = l_Lean_replaceRef(x_1, x_17);
+x_26 = l_Lean_replaceRef(x_1, x_17);
 lean_dec(x_17);
-x_25 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_25, 0, x_12);
-lean_ctor_set(x_25, 1, x_13);
-lean_ctor_set(x_25, 2, x_14);
-lean_ctor_set(x_25, 3, x_15);
-lean_ctor_set(x_25, 4, x_16);
-lean_ctor_set(x_25, 5, x_24);
-lean_ctor_set(x_25, 6, x_18);
-lean_ctor_set(x_25, 7, x_19);
-lean_ctor_set(x_25, 8, x_20);
-lean_ctor_set(x_25, 9, x_21);
-lean_ctor_set(x_25, 10, x_22);
-lean_ctor_set_uint8(x_25, sizeof(void*)*11, x_23);
-x_26 = l_Lean_throwError___at_Lean_Meta_mkSimpCongrTheorem___spec__4(x_2, x_3, x_4, x_25, x_6, x_7);
-lean_dec(x_25);
-return x_26;
+x_27 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_27, 0, x_12);
+lean_ctor_set(x_27, 1, x_13);
+lean_ctor_set(x_27, 2, x_14);
+lean_ctor_set(x_27, 3, x_15);
+lean_ctor_set(x_27, 4, x_16);
+lean_ctor_set(x_27, 5, x_26);
+lean_ctor_set(x_27, 6, x_18);
+lean_ctor_set(x_27, 7, x_19);
+lean_ctor_set(x_27, 8, x_20);
+lean_ctor_set(x_27, 9, x_21);
+lean_ctor_set(x_27, 10, x_22);
+lean_ctor_set(x_27, 11, x_24);
+lean_ctor_set_uint8(x_27, sizeof(void*)*12, x_23);
+lean_ctor_set_uint8(x_27, sizeof(void*)*12 + 1, x_25);
+x_28 = l_Lean_throwError___at_Lean_Meta_mkSimpCongrTheorem___spec__4(x_2, x_3, x_4, x_27, x_6, x_7);
+lean_dec(x_27);
+return x_28;
 }
 }
 }
@@ -8952,7 +8963,7 @@ return x_11;
 }
 else
 {
-lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; uint8_t x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; 
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; uint8_t x_23; lean_object* x_24; uint8_t x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; 
 x_12 = lean_ctor_get(x_5, 0);
 x_13 = lean_ctor_get(x_5, 1);
 x_14 = lean_ctor_get(x_5, 2);
@@ -8964,7 +8975,10 @@ x_19 = lean_ctor_get(x_5, 7);
 x_20 = lean_ctor_get(x_5, 8);
 x_21 = lean_ctor_get(x_5, 9);
 x_22 = lean_ctor_get(x_5, 10);
-x_23 = lean_ctor_get_uint8(x_5, sizeof(void*)*11);
+x_23 = lean_ctor_get_uint8(x_5, sizeof(void*)*12);
+x_24 = lean_ctor_get(x_5, 11);
+x_25 = lean_ctor_get_uint8(x_5, sizeof(void*)*12 + 1);
+lean_inc(x_24);
 lean_inc(x_22);
 lean_inc(x_21);
 lean_inc(x_20);
@@ -8977,24 +8991,26 @@ lean_inc(x_14);
 lean_inc(x_13);
 lean_inc(x_12);
 lean_dec(x_5);
-x_24 = l_Lean_replaceRef(x_1, x_17);
+x_26 = l_Lean_replaceRef(x_1, x_17);
 lean_dec(x_17);
-x_25 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_25, 0, x_12);
-lean_ctor_set(x_25, 1, x_13);
-lean_ctor_set(x_25, 2, x_14);
-lean_ctor_set(x_25, 3, x_15);
-lean_ctor_set(x_25, 4, x_16);
-lean_ctor_set(x_25, 5, x_24);
-lean_ctor_set(x_25, 6, x_18);
-lean_ctor_set(x_25, 7, x_19);
-lean_ctor_set(x_25, 8, x_20);
-lean_ctor_set(x_25, 9, x_21);
-lean_ctor_set(x_25, 10, x_22);
-lean_ctor_set_uint8(x_25, sizeof(void*)*11, x_23);
-x_26 = l_Lean_throwError___at_Lean_MVarId_proofIrrelHeq___spec__1(x_2, x_3, x_4, x_25, x_6, x_7);
-lean_dec(x_25);
-return x_26;
+x_27 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_27, 0, x_12);
+lean_ctor_set(x_27, 1, x_13);
+lean_ctor_set(x_27, 2, x_14);
+lean_ctor_set(x_27, 3, x_15);
+lean_ctor_set(x_27, 4, x_16);
+lean_ctor_set(x_27, 5, x_26);
+lean_ctor_set(x_27, 6, x_18);
+lean_ctor_set(x_27, 7, x_19);
+lean_ctor_set(x_27, 8, x_20);
+lean_ctor_set(x_27, 9, x_21);
+lean_ctor_set(x_27, 10, x_22);
+lean_ctor_set(x_27, 11, x_24);
+lean_ctor_set_uint8(x_27, sizeof(void*)*12, x_23);
+lean_ctor_set_uint8(x_27, sizeof(void*)*12 + 1, x_25);
+x_28 = l_Lean_throwError___at_Lean_MVarId_proofIrrelHeq___spec__1(x_2, x_3, x_4, x_27, x_6, x_7);
+lean_dec(x_27);
+return x_28;
 }
 }
 }
@@ -11000,119 +11016,119 @@ return x_16;
 }
 else
 {
-lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_35; lean_object* x_36; lean_object* x_48; lean_object* x_49; uint8_t x_50; lean_object* x_51; 
+lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_35; lean_object* x_36; lean_object* x_50; lean_object* x_51; uint8_t x_52; lean_object* x_53; 
 lean_dec(x_9);
 x_17 = lean_array_uget(x_6, x_8);
-x_48 = lean_ctor_get(x_17, 0);
-lean_inc(x_48);
+x_50 = lean_ctor_get(x_17, 0);
+lean_inc(x_50);
 lean_dec(x_17);
 lean_inc(x_3);
-lean_inc(x_48);
-x_49 = lean_alloc_closure((void*)(l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_Ext_applyExtTheoremAt___spec__1___lambda__1), 7, 2);
-lean_closure_set(x_49, 0, x_48);
-lean_closure_set(x_49, 1, x_3);
-x_50 = 0;
+lean_inc(x_50);
+x_51 = lean_alloc_closure((void*)(l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_Ext_applyExtTheoremAt___spec__1___lambda__1), 7, 2);
+lean_closure_set(x_51, 0, x_50);
+lean_closure_set(x_51, 1, x_3);
+x_52 = 0;
 lean_inc(x_13);
 lean_inc(x_12);
 lean_inc(x_11);
 lean_inc(x_10);
-x_51 = l_Lean_Meta_withNewMCtxDepth___at_Lean_Meta_matchesInstance___spec__1___rarg(x_49, x_50, x_10, x_11, x_12, x_13, x_14);
-if (lean_obj_tag(x_51) == 0)
-{
-lean_object* x_52; lean_object* x_53; 
-x_52 = lean_ctor_get(x_51, 1);
-lean_inc(x_52);
-lean_dec(x_51);
-lean_inc(x_13);
-lean_inc(x_12);
-lean_inc(x_11);
-lean_inc(x_10);
-x_53 = l_Lean_Meta_mkConstWithFreshMVarLevels(x_48, x_10, x_11, x_12, x_13, x_52);
+x_53 = l_Lean_Meta_withNewMCtxDepth___at_Lean_Meta_matchesInstance___spec__1___rarg(x_51, x_52, x_10, x_11, x_12, x_13, x_14);
 if (lean_obj_tag(x_53) == 0)
 {
-lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; 
-x_54 = lean_ctor_get(x_53, 0);
+lean_object* x_54; lean_object* x_55; 
+x_54 = lean_ctor_get(x_53, 1);
 lean_inc(x_54);
-x_55 = lean_ctor_get(x_53, 1);
-lean_inc(x_55);
 lean_dec(x_53);
-x_56 = l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_Ext_applyExtTheoremAt___spec__1___closed__1;
+lean_inc(x_13);
+lean_inc(x_12);
+lean_inc(x_11);
+lean_inc(x_10);
+x_55 = l_Lean_Meta_mkConstWithFreshMVarLevels(x_50, x_10, x_11, x_12, x_13, x_54);
+if (lean_obj_tag(x_55) == 0)
+{
+lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; 
+x_56 = lean_ctor_get(x_55, 0);
+lean_inc(x_56);
+x_57 = lean_ctor_get(x_55, 1);
+lean_inc(x_57);
+lean_dec(x_55);
+x_58 = l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_Ext_applyExtTheoremAt___spec__1___closed__1;
 lean_inc(x_13);
 lean_inc(x_12);
 lean_inc(x_11);
 lean_inc(x_10);
 lean_inc(x_1);
-x_57 = l_Lean_MVarId_apply(x_1, x_54, x_56, x_10, x_11, x_12, x_13, x_55);
-if (lean_obj_tag(x_57) == 0)
+x_59 = l_Lean_MVarId_apply(x_1, x_56, x_58, x_10, x_11, x_12, x_13, x_57);
+if (lean_obj_tag(x_59) == 0)
 {
-uint8_t x_58; 
-x_58 = !lean_is_exclusive(x_57);
-if (x_58 == 0)
+uint8_t x_60; 
+x_60 = !lean_is_exclusive(x_59);
+if (x_60 == 0)
 {
-lean_object* x_59; lean_object* x_60; 
-x_59 = lean_ctor_get(x_57, 1);
-x_60 = lean_box(0);
-lean_ctor_set_tag(x_57, 1);
-lean_ctor_set(x_57, 1, x_60);
-x_18 = x_57;
-x_19 = x_59;
+lean_object* x_61; lean_object* x_62; 
+x_61 = lean_ctor_get(x_59, 1);
+x_62 = lean_box(0);
+lean_ctor_set_tag(x_59, 1);
+lean_ctor_set(x_59, 1, x_62);
+x_18 = x_59;
+x_19 = x_61;
 goto block_34;
 }
 else
 {
-lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; 
-x_61 = lean_ctor_get(x_57, 0);
-x_62 = lean_ctor_get(x_57, 1);
-lean_inc(x_62);
-lean_inc(x_61);
-lean_dec(x_57);
-x_63 = lean_box(0);
-x_64 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_64, 0, x_61);
-lean_ctor_set(x_64, 1, x_63);
-x_18 = x_64;
-x_19 = x_62;
+lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; 
+x_63 = lean_ctor_get(x_59, 0);
+x_64 = lean_ctor_get(x_59, 1);
+lean_inc(x_64);
+lean_inc(x_63);
+lean_dec(x_59);
+x_65 = lean_box(0);
+x_66 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_66, 0, x_63);
+lean_ctor_set(x_66, 1, x_65);
+x_18 = x_66;
+x_19 = x_64;
 goto block_34;
 }
 }
 else
 {
-lean_object* x_65; lean_object* x_66; 
-x_65 = lean_ctor_get(x_57, 0);
-lean_inc(x_65);
-x_66 = lean_ctor_get(x_57, 1);
-lean_inc(x_66);
-lean_dec(x_57);
-x_35 = x_65;
-x_36 = x_66;
-goto block_47;
-}
-}
-else
-{
 lean_object* x_67; lean_object* x_68; 
-x_67 = lean_ctor_get(x_53, 0);
+x_67 = lean_ctor_get(x_59, 0);
 lean_inc(x_67);
-x_68 = lean_ctor_get(x_53, 1);
+x_68 = lean_ctor_get(x_59, 1);
 lean_inc(x_68);
-lean_dec(x_53);
+lean_dec(x_59);
 x_35 = x_67;
 x_36 = x_68;
-goto block_47;
+goto block_49;
 }
 }
 else
 {
 lean_object* x_69; lean_object* x_70; 
-lean_dec(x_48);
-x_69 = lean_ctor_get(x_51, 0);
+x_69 = lean_ctor_get(x_55, 0);
 lean_inc(x_69);
-x_70 = lean_ctor_get(x_51, 1);
+x_70 = lean_ctor_get(x_55, 1);
 lean_inc(x_70);
-lean_dec(x_51);
+lean_dec(x_55);
 x_35 = x_69;
 x_36 = x_70;
-goto block_47;
+goto block_49;
+}
+}
+else
+{
+lean_object* x_71; lean_object* x_72; 
+lean_dec(x_50);
+x_71 = lean_ctor_get(x_53, 0);
+lean_inc(x_71);
+x_72 = lean_ctor_get(x_53, 1);
+lean_inc(x_72);
+lean_dec(x_53);
+x_35 = x_71;
+x_36 = x_72;
+goto block_49;
 }
 block_34:
 {
@@ -11180,46 +11196,50 @@ return x_33;
 }
 }
 }
-block_47:
+block_49:
 {
 uint8_t x_37; 
-x_37 = l_Lean_Exception_isRuntime(x_35);
+x_37 = l_Lean_Exception_isInterrupt(x_35);
 if (x_37 == 0)
 {
-lean_object* x_38; uint8_t x_39; 
+uint8_t x_38; 
+x_38 = l_Lean_Exception_isRuntime(x_35);
+if (x_38 == 0)
+{
+lean_object* x_39; uint8_t x_40; 
 lean_dec(x_35);
-x_38 = l_Lean_Meta_SavedState_restore(x_4, x_10, x_11, x_12, x_13, x_36);
-x_39 = !lean_is_exclusive(x_38);
-if (x_39 == 0)
+x_39 = l_Lean_Meta_SavedState_restore(x_4, x_10, x_11, x_12, x_13, x_36);
+x_40 = !lean_is_exclusive(x_39);
+if (x_40 == 0)
 {
-lean_object* x_40; lean_object* x_41; 
-x_40 = lean_ctor_get(x_38, 1);
-x_41 = lean_box(0);
-lean_ctor_set(x_38, 1, x_41);
-x_18 = x_38;
-x_19 = x_40;
+lean_object* x_41; lean_object* x_42; 
+x_41 = lean_ctor_get(x_39, 1);
+x_42 = lean_box(0);
+lean_ctor_set(x_39, 1, x_42);
+x_18 = x_39;
+x_19 = x_41;
 goto block_34;
 }
 else
 {
-lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; 
-x_42 = lean_ctor_get(x_38, 0);
-x_43 = lean_ctor_get(x_38, 1);
+lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; 
+x_43 = lean_ctor_get(x_39, 0);
+x_44 = lean_ctor_get(x_39, 1);
+lean_inc(x_44);
 lean_inc(x_43);
-lean_inc(x_42);
-lean_dec(x_38);
-x_44 = lean_box(0);
-x_45 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_45, 0, x_42);
-lean_ctor_set(x_45, 1, x_44);
-x_18 = x_45;
-x_19 = x_43;
+lean_dec(x_39);
+x_45 = lean_box(0);
+x_46 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_46, 0, x_43);
+lean_ctor_set(x_46, 1, x_45);
+x_18 = x_46;
+x_19 = x_44;
 goto block_34;
 }
 }
 else
 {
-lean_object* x_46; 
+lean_object* x_47; 
 lean_dec(x_13);
 lean_dec(x_12);
 lean_dec(x_11);
@@ -11227,10 +11247,26 @@ lean_dec(x_10);
 lean_dec(x_5);
 lean_dec(x_3);
 lean_dec(x_1);
-x_46 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_46, 0, x_35);
-lean_ctor_set(x_46, 1, x_36);
-return x_46;
+x_47 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_47, 0, x_35);
+lean_ctor_set(x_47, 1, x_36);
+return x_47;
+}
+}
+else
+{
+lean_object* x_48; 
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_5);
+lean_dec(x_3);
+lean_dec(x_1);
+x_48 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_48, 0, x_35);
+lean_ctor_set(x_48, 1, x_36);
+return x_48;
 }
 }
 }
@@ -13824,14 +13860,18 @@ if (x_20 == 0)
 lean_object* x_21; lean_object* x_22; uint8_t x_23; 
 x_21 = lean_ctor_get(x_19, 0);
 x_22 = lean_ctor_get(x_19, 1);
-x_23 = l_Lean_Exception_isRuntime(x_21);
+x_23 = l_Lean_Exception_isInterrupt(x_21);
 if (x_23 == 0)
 {
-lean_object* x_24; 
+uint8_t x_24; 
+x_24 = l_Lean_Exception_isRuntime(x_21);
+if (x_24 == 0)
+{
+lean_object* x_25; 
 lean_free_object(x_19);
 lean_dec(x_21);
-x_24 = lean_apply_10(x_3, x_1, x_2, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_22);
-return x_24;
+x_25 = lean_apply_10(x_3, x_1, x_2, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_22);
+return x_25;
 }
 else
 {
@@ -13850,23 +13890,6 @@ return x_19;
 }
 else
 {
-lean_object* x_25; lean_object* x_26; uint8_t x_27; 
-x_25 = lean_ctor_get(x_19, 0);
-x_26 = lean_ctor_get(x_19, 1);
-lean_inc(x_26);
-lean_inc(x_25);
-lean_dec(x_19);
-x_27 = l_Lean_Exception_isRuntime(x_25);
-if (x_27 == 0)
-{
-lean_object* x_28; 
-lean_dec(x_25);
-x_28 = lean_apply_10(x_3, x_1, x_2, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_26);
-return x_28;
-}
-else
-{
-lean_object* x_29; 
 lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_10);
@@ -13877,33 +13900,88 @@ lean_dec(x_6);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_29 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_29, 0, x_25);
-lean_ctor_set(x_29, 1, x_26);
-return x_29;
-}
-}
+return x_19;
 }
 }
 else
 {
-lean_object* x_30; lean_object* x_31; 
-x_30 = lean_alloc_closure((void*)(l_Lean_Elab_Tactic_Ext_withExtN___at_Lean_Elab_Tactic_Ext_extCore___spec__1___lambda__1), 12, 2);
-lean_closure_set(x_30, 0, x_3);
-lean_closure_set(x_30, 1, x_17);
-x_31 = l_Lean_Elab_Tactic_Ext_withExt1___at_Lean_Elab_Tactic_Ext_extCore___spec__2(x_1, x_2, x_30, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+lean_object* x_26; lean_object* x_27; uint8_t x_28; 
+x_26 = lean_ctor_get(x_19, 0);
+x_27 = lean_ctor_get(x_19, 1);
+lean_inc(x_27);
+lean_inc(x_26);
+lean_dec(x_19);
+x_28 = l_Lean_Exception_isInterrupt(x_26);
+if (x_28 == 0)
+{
+uint8_t x_29; 
+x_29 = l_Lean_Exception_isRuntime(x_26);
+if (x_29 == 0)
+{
+lean_object* x_30; 
+lean_dec(x_26);
+x_30 = lean_apply_10(x_3, x_1, x_2, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_27);
+return x_30;
+}
+else
+{
+lean_object* x_31; 
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_31 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_31, 0, x_26);
+lean_ctor_set(x_31, 1, x_27);
 return x_31;
 }
 }
 else
 {
 lean_object* x_32; 
-lean_dec(x_4);
-x_32 = lean_apply_10(x_3, x_1, x_2, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_32 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_32, 0, x_26);
+lean_ctor_set(x_32, 1, x_27);
 return x_32;
 }
 }
 }
+}
+else
+{
+lean_object* x_33; lean_object* x_34; 
+x_33 = lean_alloc_closure((void*)(l_Lean_Elab_Tactic_Ext_withExtN___at_Lean_Elab_Tactic_Ext_extCore___spec__1___lambda__1), 12, 2);
+lean_closure_set(x_33, 0, x_3);
+lean_closure_set(x_33, 1, x_17);
+x_34 = l_Lean_Elab_Tactic_Ext_withExt1___at_Lean_Elab_Tactic_Ext_extCore___spec__2(x_1, x_2, x_33, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+return x_34;
+}
+}
+else
+{
+lean_object* x_35; 
+lean_dec(x_4);
+x_35 = lean_apply_10(x_3, x_1, x_2, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+return x_35;
+}
+}
+}
 LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_Ext_extCore___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
 _start:
 {
@@ -14455,8 +14533,12 @@ x_50 = lean_alloc_ctor(6, 2, 0);
 lean_ctor_set(x_50, 0, x_24);
 lean_ctor_set(x_50, 1, x_49);
 lean_inc(x_10);
+lean_inc(x_9);
+lean_inc(x_7);
+lean_inc(x_6);
+lean_inc(x_5);
+lean_inc(x_4);
 x_51 = l_Lean_Linter_logLint___at_Lean_Elab_Tactic_Ext_evalExt___spec__3(x_30, x_43, x_50, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_25);
-lean_dec(x_43);
 x_52 = lean_ctor_get(x_51, 0);
 lean_inc(x_52);
 x_53 = lean_ctor_get(x_51, 1);
@@ -14531,8 +14613,12 @@ x_79 = lean_alloc_ctor(6, 2, 0);
 lean_ctor_set(x_79, 0, x_77);
 lean_ctor_set(x_79, 1, x_78);
 lean_inc(x_10);
+lean_inc(x_9);
+lean_inc(x_7);
+lean_inc(x_6);
+lean_inc(x_5);
+lean_inc(x_4);
 x_80 = l_Lean_Linter_logLint___at_Lean_Elab_Tactic_Ext_evalExt___spec__3(x_58, x_71, x_79, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_25);
-lean_dec(x_71);
 x_81 = lean_ctor_get(x_80, 0);
 lean_inc(x_81);
 x_82 = lean_ctor_get(x_80, 1);
@@ -14695,13 +14781,7 @@ _start:
 lean_object* x_13; 
 x_13 = l_Lean_Linter_logLint___at_Lean_Elab_Tactic_Ext_evalExt___spec__3(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12);
 lean_dec(x_11);
-lean_dec(x_9);
 lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_2);
 return x_13;
 }
 }

stage0/stdlib/Lean/Elab/Tactic/LibrarySearch.c

@@ -99,7 +99,6 @@ LEAN_EXPORT lean_object* l_Lean_instantiateMVars___at_Lean_Elab_LibrarySearch_ex
 lean_object* l_Lean_log___at_Lean_Elab_Tactic_closeUsingOrAdmit___spec__3(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_LibrarySearch_evalExact_declRange___closed__2;
 lean_object* lean_array_to_list(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Elab_LibrarySearch_elabExact_x3fTerm___lambda__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Elab_LibrarySearch_evalExact___closed__6;
 extern lean_object* l_Lean_Elab_Term_termElabAttribute;
 lean_object* l_Lean_MVarId_withContext___at_Lean_Elab_Tactic_withMainContext___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -666,6 +665,7 @@ _start:
 lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; size_t x_21; lean_object* x_22; lean_object* x_23; 
 x_16 = l_Lean_Elab_LibrarySearch_exact_x3f___lambda__5___closed__2;
 x_17 = lean_unsigned_to_nat(90u);
+lean_inc(x_14);
 lean_inc(x_13);
 lean_inc(x_1);
 x_18 = l_Lean_reportOutOfHeartbeats(x_16, x_1, x_17, x_13, x_14, x_15);
@@ -2372,6 +2372,8 @@ lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
 return x_26;
 }
 else
@@ -2381,6 +2383,8 @@ lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
 lean_dec(x_4);
 x_27 = !lean_is_exclusive(x_24);
 if (x_27 == 0)
@@ -2420,7 +2424,10 @@ if (x_33 == 0)
 lean_object* x_34; uint8_t x_35; lean_object* x_36; lean_object* x_37; uint8_t x_38; lean_object* x_39; 
 x_34 = l_Lean_Elab_LibrarySearch_elabExact_x3fTerm___lambda__4___closed__4;
 x_35 = 2;
+lean_inc(x_12);
 lean_inc(x_11);
+lean_inc(x_10);
+lean_inc(x_9);
 x_36 = l_Lean_log___at_Lean_Elab_Term_exceptionToSorry___spec__2(x_34, x_35, x_7, x_8, x_9, x_10, x_11, x_12, x_31);
 x_37 = lean_ctor_get(x_36, 1);
 lean_inc(x_37);
@@ -2434,7 +2441,10 @@ else
 lean_object* x_40; uint8_t x_41; lean_object* x_42; lean_object* x_43; uint8_t x_44; lean_object* x_45; 
 x_40 = l_Lean_Elab_LibrarySearch_elabExact_x3fTerm___lambda__4___closed__7;
 x_41 = 2;
+lean_inc(x_12);
 lean_inc(x_11);
+lean_inc(x_10);
+lean_inc(x_9);
 x_42 = l_Lean_log___at_Lean_Elab_Term_exceptionToSorry___spec__2(x_40, x_41, x_7, x_8, x_9, x_10, x_11, x_12, x_31);
 x_43 = lean_ctor_get(x_42, 1);
 lean_inc(x_43);
@@ -2452,6 +2462,8 @@ lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
@@ -2529,7 +2541,7 @@ lean_dec(x_18);
 x_21 = l_Lean_Elab_LibrarySearch_elabExact_x3fTerm___lambda__5___closed__1;
 x_22 = l_Lean_Elab_LibrarySearch_elabExact_x3fTerm___lambda__5___closed__2;
 lean_inc(x_20);
-x_23 = lean_alloc_closure((void*)(l_Lean_Elab_LibrarySearch_elabExact_x3fTerm___lambda__4___boxed), 13, 6);
+x_23 = lean_alloc_closure((void*)(l_Lean_Elab_LibrarySearch_elabExact_x3fTerm___lambda__4), 13, 6);
 lean_closure_set(x_23, 0, x_20);
 lean_closure_set(x_23, 1, x_21);
 lean_closure_set(x_23, 2, x_22);
@@ -2657,16 +2669,6 @@ lean_dec(x_2);
 return x_10;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Elab_LibrarySearch_elabExact_x3fTerm___lambda__4___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13) {
-_start:
-{
-lean_object* x_14; 
-x_14 = l_Lean_Elab_LibrarySearch_elabExact_x3fTerm___lambda__4(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-lean_dec(x_8);
-lean_dec(x_7);
-return x_14;
-}
-}
 static lean_object* _init_l___regBuiltin_Lean_Elab_LibrarySearch_elabExact_x3fTerm___closed__1() {
 _start:
 {

stage0/stdlib/Lean/Elab/Tactic/Location.c

@@ -16,6 +16,7 @@ extern "C" {
 lean_object* lean_mk_empty_array_with_capacity(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_expandLocation___boxed(lean_object*);
 lean_object* l_Lean_Elab_Tactic_getFVarId(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+uint8_t l_Lean_Exception_isInterrupt(lean_object*);
 static lean_object* l_Lean_Elab_Tactic_expandOptLocation___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_expandOptLocation(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_expandLocation(lean_object*);
@@ -896,37 +897,41 @@ if (x_26 == 0)
 lean_object* x_27; lean_object* x_28; uint8_t x_29; 
 x_27 = lean_ctor_get(x_21, 0);
 x_28 = lean_ctor_get(x_21, 1);
-x_29 = l_Lean_Exception_isRuntime(x_27);
+x_29 = l_Lean_Exception_isInterrupt(x_27);
 if (x_29 == 0)
 {
-uint8_t x_30; lean_object* x_31; uint8_t x_32; 
+uint8_t x_30; 
+x_30 = l_Lean_Exception_isRuntime(x_27);
+if (x_30 == 0)
+{
+uint8_t x_31; lean_object* x_32; uint8_t x_33; 
 lean_free_object(x_21);
 lean_dec(x_27);
-x_30 = 0;
-x_31 = l_Lean_Elab_Tactic_SavedState_restore(x_19, x_30, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_28);
+x_31 = 0;
+x_32 = l_Lean_Elab_Tactic_SavedState_restore(x_19, x_31, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_28);
 lean_dec(x_6);
 lean_dec(x_5);
-x_32 = !lean_is_exclusive(x_31);
-if (x_32 == 0)
+x_33 = !lean_is_exclusive(x_32);
+if (x_33 == 0)
 {
-lean_object* x_33; lean_object* x_34; 
-x_33 = lean_ctor_get(x_31, 0);
-lean_dec(x_33);
-x_34 = lean_box(0);
-lean_ctor_set(x_31, 0, x_34);
-return x_31;
+lean_object* x_34; lean_object* x_35; 
+x_34 = lean_ctor_get(x_32, 0);
+lean_dec(x_34);
+x_35 = lean_box(0);
+lean_ctor_set(x_32, 0, x_35);
+return x_32;
 }
 else
 {
-lean_object* x_35; lean_object* x_36; lean_object* x_37; 
-x_35 = lean_ctor_get(x_31, 1);
-lean_inc(x_35);
-lean_dec(x_31);
-x_36 = lean_box(0);
-x_37 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_37, 0, x_36);
-lean_ctor_set(x_37, 1, x_35);
-return x_37;
+lean_object* x_36; lean_object* x_37; lean_object* x_38; 
+x_36 = lean_ctor_get(x_32, 1);
+lean_inc(x_36);
+lean_dec(x_32);
+x_37 = lean_box(0);
+x_38 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_38, 0, x_37);
+lean_ctor_set(x_38, 1, x_36);
+return x_38;
 }
 }
 else
@@ -945,44 +950,6 @@ return x_21;
 }
 else
 {
-lean_object* x_38; lean_object* x_39; uint8_t x_40; 
-x_38 = lean_ctor_get(x_21, 0);
-x_39 = lean_ctor_get(x_21, 1);
-lean_inc(x_39);
-lean_inc(x_38);
-lean_dec(x_21);
-x_40 = l_Lean_Exception_isRuntime(x_38);
-if (x_40 == 0)
-{
-uint8_t x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; 
-lean_dec(x_38);
-x_41 = 0;
-x_42 = l_Lean_Elab_Tactic_SavedState_restore(x_19, x_41, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_39);
-lean_dec(x_6);
-lean_dec(x_5);
-x_43 = lean_ctor_get(x_42, 1);
-lean_inc(x_43);
-if (lean_is_exclusive(x_42)) {
- lean_ctor_release(x_42, 0);
- lean_ctor_release(x_42, 1);
- x_44 = x_42;
-} else {
- lean_dec_ref(x_42);
- x_44 = lean_box(0);
-}
-x_45 = lean_box(0);
-if (lean_is_scalar(x_44)) {
- x_46 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_46 = x_44;
-}
-lean_ctor_set(x_46, 0, x_45);
-lean_ctor_set(x_46, 1, x_43);
-return x_46;
-}
-else
-{
-lean_object* x_47; 
 lean_dec(x_19);
 lean_dec(x_12);
 lean_dec(x_11);
@@ -992,17 +959,91 @@ lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
-x_47 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_47, 0, x_38);
-lean_ctor_set(x_47, 1, x_39);
-return x_47;
+return x_21;
+}
+}
+else
+{
+lean_object* x_39; lean_object* x_40; uint8_t x_41; 
+x_39 = lean_ctor_get(x_21, 0);
+x_40 = lean_ctor_get(x_21, 1);
+lean_inc(x_40);
+lean_inc(x_39);
+lean_dec(x_21);
+x_41 = l_Lean_Exception_isInterrupt(x_39);
+if (x_41 == 0)
+{
+uint8_t x_42; 
+x_42 = l_Lean_Exception_isRuntime(x_39);
+if (x_42 == 0)
+{
+uint8_t x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; 
+lean_dec(x_39);
+x_43 = 0;
+x_44 = l_Lean_Elab_Tactic_SavedState_restore(x_19, x_43, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_40);
+lean_dec(x_6);
+lean_dec(x_5);
+x_45 = lean_ctor_get(x_44, 1);
+lean_inc(x_45);
+if (lean_is_exclusive(x_44)) {
+ lean_ctor_release(x_44, 0);
+ lean_ctor_release(x_44, 1);
+ x_46 = x_44;
+} else {
+ lean_dec_ref(x_44);
+ x_46 = lean_box(0);
+}
+x_47 = lean_box(0);
+if (lean_is_scalar(x_46)) {
+ x_48 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_48 = x_46;
+}
+lean_ctor_set(x_48, 0, x_47);
+lean_ctor_set(x_48, 1, x_45);
+return x_48;
+}
+else
+{
+lean_object* x_49; 
+lean_dec(x_19);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+x_49 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_49, 0, x_39);
+lean_ctor_set(x_49, 1, x_40);
+return x_49;
+}
+}
+else
+{
+lean_object* x_50; 
+lean_dec(x_19);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+x_50 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_50, 0, x_39);
+lean_ctor_set(x_50, 1, x_40);
+return x_50;
 }
 }
 }
 }
 else
 {
-uint8_t x_48; 
+uint8_t x_51; 
 lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_10);
@@ -1013,45 +1054,45 @@ lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_2);
-x_48 = !lean_is_exclusive(x_15);
-if (x_48 == 0)
+x_51 = !lean_is_exclusive(x_15);
+if (x_51 == 0)
 {
 return x_15;
 }
 else
 {
-lean_object* x_49; lean_object* x_50; lean_object* x_51; 
-x_49 = lean_ctor_get(x_15, 0);
-x_50 = lean_ctor_get(x_15, 1);
-lean_inc(x_50);
-lean_inc(x_49);
+lean_object* x_52; lean_object* x_53; lean_object* x_54; 
+x_52 = lean_ctor_get(x_15, 0);
+x_53 = lean_ctor_get(x_15, 1);
+lean_inc(x_53);
+lean_inc(x_52);
 lean_dec(x_15);
-x_51 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_51, 0, x_49);
-lean_ctor_set(x_51, 1, x_50);
-return x_51;
+x_54 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_54, 0, x_52);
+lean_ctor_set(x_54, 1, x_53);
+return x_54;
 }
 }
 }
 else
 {
-lean_object* x_52; uint8_t x_53; lean_object* x_54; lean_object* x_55; uint8_t x_56; 
+lean_object* x_55; uint8_t x_56; lean_object* x_57; lean_object* x_58; uint8_t x_59; 
 lean_dec(x_4);
-x_52 = lean_ctor_get(x_1, 0);
-lean_inc(x_52);
-x_53 = lean_ctor_get_uint8(x_1, sizeof(void*)*1);
+x_55 = lean_ctor_get(x_1, 0);
+lean_inc(x_55);
+x_56 = lean_ctor_get_uint8(x_1, sizeof(void*)*1);
 lean_dec(x_1);
-x_54 = lean_array_get_size(x_52);
-x_55 = lean_unsigned_to_nat(0u);
-x_56 = lean_nat_dec_lt(x_55, x_54);
+x_57 = lean_array_get_size(x_55);
+x_58 = lean_unsigned_to_nat(0u);
+x_59 = lean_nat_dec_lt(x_58, x_57);
+if (x_59 == 0)
+{
+lean_dec(x_57);
+lean_dec(x_55);
+lean_dec(x_2);
 if (x_56 == 0)
 {
-lean_dec(x_54);
-lean_dec(x_52);
-lean_dec(x_2);
-if (x_53 == 0)
-{
-lean_object* x_57; lean_object* x_58; 
+lean_object* x_60; lean_object* x_61; 
 lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_10);
@@ -1061,60 +1102,60 @@ lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_3);
-x_57 = lean_box(0);
-x_58 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_58, 0, x_57);
-lean_ctor_set(x_58, 1, x_13);
-return x_58;
+x_60 = lean_box(0);
+x_61 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_61, 0, x_60);
+lean_ctor_set(x_61, 1, x_13);
+return x_61;
 }
 else
 {
-lean_object* x_59; 
-x_59 = l_Lean_Elab_Tactic_withMainContext___rarg(x_3, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-return x_59;
-}
-}
-else
-{
-uint8_t x_60; 
-x_60 = lean_nat_dec_le(x_54, x_54);
-if (x_60 == 0)
-{
-lean_dec(x_54);
-lean_dec(x_52);
-lean_dec(x_2);
-if (x_53 == 0)
-{
-lean_object* x_61; lean_object* x_62; 
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_3);
-x_61 = lean_box(0);
-x_62 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_62, 0, x_61);
-lean_ctor_set(x_62, 1, x_13);
+lean_object* x_62; 
+x_62 = l_Lean_Elab_Tactic_withMainContext___rarg(x_3, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
 return x_62;
 }
+}
 else
 {
-lean_object* x_63; 
-x_63 = l_Lean_Elab_Tactic_withMainContext___rarg(x_3, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-return x_63;
+uint8_t x_63; 
+x_63 = lean_nat_dec_le(x_57, x_57);
+if (x_63 == 0)
+{
+lean_dec(x_57);
+lean_dec(x_55);
+lean_dec(x_2);
+if (x_56 == 0)
+{
+lean_object* x_64; lean_object* x_65; 
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_3);
+x_64 = lean_box(0);
+x_65 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_65, 0, x_64);
+lean_ctor_set(x_65, 1, x_13);
+return x_65;
+}
+else
+{
+lean_object* x_66; 
+x_66 = l_Lean_Elab_Tactic_withMainContext___rarg(x_3, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+return x_66;
 }
 }
 else
 {
-size_t x_64; size_t x_65; lean_object* x_66; lean_object* x_67; 
-x_64 = 0;
-x_65 = lean_usize_of_nat(x_54);
-lean_dec(x_54);
-x_66 = lean_box(0);
+size_t x_67; size_t x_68; lean_object* x_69; lean_object* x_70; 
+x_67 = 0;
+x_68 = lean_usize_of_nat(x_57);
+lean_dec(x_57);
+x_69 = lean_box(0);
 lean_inc(x_12);
 lean_inc(x_11);
 lean_inc(x_10);
@@ -1123,13 +1164,13 @@ lean_inc(x_8);
 lean_inc(x_7);
 lean_inc(x_6);
 lean_inc(x_5);
-x_67 = l_Array_foldlMUnsafe_fold___at_Lean_Elab_Tactic_withLocation___spec__2(x_2, x_52, x_64, x_65, x_66, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-lean_dec(x_52);
-if (lean_obj_tag(x_67) == 0)
+x_70 = l_Array_foldlMUnsafe_fold___at_Lean_Elab_Tactic_withLocation___spec__2(x_2, x_55, x_67, x_68, x_69, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+lean_dec(x_55);
+if (lean_obj_tag(x_70) == 0)
 {
-if (x_53 == 0)
+if (x_56 == 0)
 {
-uint8_t x_68; 
+uint8_t x_71; 
 lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_10);
@@ -1139,66 +1180,66 @@ lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_3);
-x_68 = !lean_is_exclusive(x_67);
-if (x_68 == 0)
+x_71 = !lean_is_exclusive(x_70);
+if (x_71 == 0)
 {
-lean_object* x_69; 
-x_69 = lean_ctor_get(x_67, 0);
-lean_dec(x_69);
-lean_ctor_set(x_67, 0, x_66);
-return x_67;
+lean_object* x_72; 
+x_72 = lean_ctor_get(x_70, 0);
+lean_dec(x_72);
+lean_ctor_set(x_70, 0, x_69);
+return x_70;
 }
 else
 {
-lean_object* x_70; lean_object* x_71; 
-x_70 = lean_ctor_get(x_67, 1);
-lean_inc(x_70);
-lean_dec(x_67);
-x_71 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_71, 0, x_66);
-lean_ctor_set(x_71, 1, x_70);
-return x_71;
+lean_object* x_73; lean_object* x_74; 
+x_73 = lean_ctor_get(x_70, 1);
+lean_inc(x_73);
+lean_dec(x_70);
+x_74 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_74, 0, x_69);
+lean_ctor_set(x_74, 1, x_73);
+return x_74;
 }
 }
 else
 {
-lean_object* x_72; lean_object* x_73; 
-x_72 = lean_ctor_get(x_67, 1);
-lean_inc(x_72);
-lean_dec(x_67);
-x_73 = l_Lean_Elab_Tactic_withMainContext___rarg(x_3, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_72);
-return x_73;
-}
-}
-else
-{
-uint8_t x_74; 
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_3);
-x_74 = !lean_is_exclusive(x_67);
-if (x_74 == 0)
-{
-return x_67;
-}
-else
-{
-lean_object* x_75; lean_object* x_76; lean_object* x_77; 
-x_75 = lean_ctor_get(x_67, 0);
-x_76 = lean_ctor_get(x_67, 1);
-lean_inc(x_76);
+lean_object* x_75; lean_object* x_76; 
+x_75 = lean_ctor_get(x_70, 1);
 lean_inc(x_75);
-lean_dec(x_67);
-x_77 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_77, 0, x_75);
-lean_ctor_set(x_77, 1, x_76);
-return x_77;
+lean_dec(x_70);
+x_76 = l_Lean_Elab_Tactic_withMainContext___rarg(x_3, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_75);
+return x_76;
+}
+}
+else
+{
+uint8_t x_77; 
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_3);
+x_77 = !lean_is_exclusive(x_70);
+if (x_77 == 0)
+{
+return x_70;
+}
+else
+{
+lean_object* x_78; lean_object* x_79; lean_object* x_80; 
+x_78 = lean_ctor_get(x_70, 0);
+x_79 = lean_ctor_get(x_70, 1);
+lean_inc(x_79);
+lean_inc(x_78);
+lean_dec(x_70);
+x_80 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_80, 0, x_78);
+lean_ctor_set(x_80, 1, x_79);
+return x_80;
 }
 }
 }

stage0/stdlib/Lean/Elab/Tactic/Match.c

@@ -2005,7 +2005,7 @@ return x_15;
 }
 else
 {
-lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; uint8_t x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; 
+lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; uint8_t x_27; lean_object* x_28; uint8_t x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; 
 x_16 = lean_ctor_get(x_9, 0);
 x_17 = lean_ctor_get(x_9, 1);
 x_18 = lean_ctor_get(x_9, 2);
@@ -2017,7 +2017,10 @@ x_23 = lean_ctor_get(x_9, 7);
 x_24 = lean_ctor_get(x_9, 8);
 x_25 = lean_ctor_get(x_9, 9);
 x_26 = lean_ctor_get(x_9, 10);
-x_27 = lean_ctor_get_uint8(x_9, sizeof(void*)*11);
+x_27 = lean_ctor_get_uint8(x_9, sizeof(void*)*12);
+x_28 = lean_ctor_get(x_9, 11);
+x_29 = lean_ctor_get_uint8(x_9, sizeof(void*)*12 + 1);
+lean_inc(x_28);
 lean_inc(x_26);
 lean_inc(x_25);
 lean_inc(x_24);
@@ -2030,32 +2033,34 @@ lean_inc(x_18);
 lean_inc(x_17);
 lean_inc(x_16);
 lean_dec(x_9);
-x_28 = l_Lean_replaceRef(x_1, x_21);
+x_30 = l_Lean_replaceRef(x_1, x_21);
 lean_dec(x_21);
 lean_dec(x_1);
-x_29 = lean_alloc_ctor(0, 11, 1);
-lean_ctor_set(x_29, 0, x_16);
-lean_ctor_set(x_29, 1, x_17);
-lean_ctor_set(x_29, 2, x_18);
-lean_ctor_set(x_29, 3, x_19);
-lean_ctor_set(x_29, 4, x_20);
-lean_ctor_set(x_29, 5, x_28);
-lean_ctor_set(x_29, 6, x_22);
-lean_ctor_set(x_29, 7, x_23);
-lean_ctor_set(x_29, 8, x_24);
-lean_ctor_set(x_29, 9, x_25);
-lean_ctor_set(x_29, 10, x_26);
-lean_ctor_set_uint8(x_29, sizeof(void*)*11, x_27);
-x_30 = l_Lean_throwError___at_Lean_Elab_Tactic_evalMatch___spec__3(x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_29, x_10, x_11);
+x_31 = lean_alloc_ctor(0, 12, 2);
+lean_ctor_set(x_31, 0, x_16);
+lean_ctor_set(x_31, 1, x_17);
+lean_ctor_set(x_31, 2, x_18);
+lean_ctor_set(x_31, 3, x_19);
+lean_ctor_set(x_31, 4, x_20);
+lean_ctor_set(x_31, 5, x_30);
+lean_ctor_set(x_31, 6, x_22);
+lean_ctor_set(x_31, 7, x_23);
+lean_ctor_set(x_31, 8, x_24);
+lean_ctor_set(x_31, 9, x_25);
+lean_ctor_set(x_31, 10, x_26);
+lean_ctor_set(x_31, 11, x_28);
+lean_ctor_set_uint8(x_31, sizeof(void*)*12, x_27);
+lean_ctor_set_uint8(x_31, sizeof(void*)*12 + 1, x_29);
+x_32 = l_Lean_throwError___at_Lean_Elab_Tactic_evalMatch___spec__3(x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_31, x_10, x_11);
 lean_dec(x_10);
-lean_dec(x_29);
+lean_dec(x_31);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-return x_30;
+return x_32;
 }
 }
 }
@@ -2781,25 +2786,27 @@ return x_16;
 }
 else
 {
-lean_object* x_17; lean_object* x_18; lean_object* x_19; uint8_t x_20; uint8_t x_21; uint8_t x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; uint8_t x_27; uint8_t x_28; uint8_t x_29; uint8_t x_30; uint8_t x_31; lean_object* x_32; uint8_t x_33; uint8_t x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; 
+lean_object* x_17; lean_object* x_18; lean_object* x_19; uint8_t x_20; uint8_t x_21; uint8_t x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; uint8_t x_27; uint8_t x_28; uint8_t x_29; uint8_t x_30; uint8_t x_31; lean_object* x_32; lean_object* x_33; uint8_t x_34; uint8_t x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; 
 x_17 = lean_ctor_get(x_5, 0);
 x_18 = lean_ctor_get(x_5, 1);
 x_19 = lean_ctor_get(x_5, 2);
-x_20 = lean_ctor_get_uint8(x_5, sizeof(void*)*8);
-x_21 = lean_ctor_get_uint8(x_5, sizeof(void*)*8 + 1);
-x_22 = lean_ctor_get_uint8(x_5, sizeof(void*)*8 + 2);
+x_20 = lean_ctor_get_uint8(x_5, sizeof(void*)*9);
+x_21 = lean_ctor_get_uint8(x_5, sizeof(void*)*9 + 1);
+x_22 = lean_ctor_get_uint8(x_5, sizeof(void*)*9 + 2);
 x_23 = lean_ctor_get(x_5, 3);
 x_24 = lean_ctor_get(x_5, 4);
 x_25 = lean_ctor_get(x_5, 5);
 x_26 = lean_ctor_get(x_5, 6);
-x_27 = lean_ctor_get_uint8(x_5, sizeof(void*)*8 + 3);
-x_28 = lean_ctor_get_uint8(x_5, sizeof(void*)*8 + 4);
-x_29 = lean_ctor_get_uint8(x_5, sizeof(void*)*8 + 5);
-x_30 = lean_ctor_get_uint8(x_5, sizeof(void*)*8 + 6);
-x_31 = lean_ctor_get_uint8(x_5, sizeof(void*)*8 + 7);
+x_27 = lean_ctor_get_uint8(x_5, sizeof(void*)*9 + 3);
+x_28 = lean_ctor_get_uint8(x_5, sizeof(void*)*9 + 4);
+x_29 = lean_ctor_get_uint8(x_5, sizeof(void*)*9 + 5);
+x_30 = lean_ctor_get_uint8(x_5, sizeof(void*)*9 + 6);
+x_31 = lean_ctor_get_uint8(x_5, sizeof(void*)*9 + 7);
 x_32 = lean_ctor_get(x_5, 7);
-x_33 = lean_ctor_get_uint8(x_5, sizeof(void*)*8 + 8);
-x_34 = lean_ctor_get_uint8(x_5, sizeof(void*)*8 + 9);
+x_33 = lean_ctor_get(x_5, 8);
+x_34 = lean_ctor_get_uint8(x_5, sizeof(void*)*9 + 8);
+x_35 = lean_ctor_get_uint8(x_5, sizeof(void*)*9 + 9);
+lean_inc(x_33);
 lean_inc(x_32);
 lean_inc(x_26);
 lean_inc(x_25);
@@ -2810,33 +2817,34 @@ lean_inc(x_18);
 lean_inc(x_17);
 lean_dec(x_5);
 lean_inc(x_2);
-x_35 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_35, 0, x_1);
-lean_ctor_set(x_35, 1, x_2);
-x_36 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_36, 0, x_35);
-lean_ctor_set(x_36, 1, x_19);
-x_37 = lean_alloc_ctor(0, 8, 10);
-lean_ctor_set(x_37, 0, x_17);
-lean_ctor_set(x_37, 1, x_18);
-lean_ctor_set(x_37, 2, x_36);
-lean_ctor_set(x_37, 3, x_23);
-lean_ctor_set(x_37, 4, x_24);
-lean_ctor_set(x_37, 5, x_25);
-lean_ctor_set(x_37, 6, x_26);
-lean_ctor_set(x_37, 7, x_32);
-lean_ctor_set_uint8(x_37, sizeof(void*)*8, x_20);
-lean_ctor_set_uint8(x_37, sizeof(void*)*8 + 1, x_21);
-lean_ctor_set_uint8(x_37, sizeof(void*)*8 + 2, x_22);
-lean_ctor_set_uint8(x_37, sizeof(void*)*8 + 3, x_27);
-lean_ctor_set_uint8(x_37, sizeof(void*)*8 + 4, x_28);
-lean_ctor_set_uint8(x_37, sizeof(void*)*8 + 5, x_29);
-lean_ctor_set_uint8(x_37, sizeof(void*)*8 + 6, x_30);
-lean_ctor_set_uint8(x_37, sizeof(void*)*8 + 7, x_31);
-lean_ctor_set_uint8(x_37, sizeof(void*)*8 + 8, x_33);
-lean_ctor_set_uint8(x_37, sizeof(void*)*8 + 9, x_34);
-x_38 = l_Lean_Elab_Tactic_evalTactic(x_2, x_3, x_4, x_37, x_6, x_7, x_8, x_9, x_10, x_11);
-return x_38;
+x_36 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_36, 0, x_1);
+lean_ctor_set(x_36, 1, x_2);
+x_37 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_37, 0, x_36);
+lean_ctor_set(x_37, 1, x_19);
+x_38 = lean_alloc_ctor(0, 9, 10);
+lean_ctor_set(x_38, 0, x_17);
+lean_ctor_set(x_38, 1, x_18);
+lean_ctor_set(x_38, 2, x_37);
+lean_ctor_set(x_38, 3, x_23);
+lean_ctor_set(x_38, 4, x_24);
+lean_ctor_set(x_38, 5, x_25);
+lean_ctor_set(x_38, 6, x_26);
+lean_ctor_set(x_38, 7, x_32);
+lean_ctor_set(x_38, 8, x_33);
+lean_ctor_set_uint8(x_38, sizeof(void*)*9, x_20);
+lean_ctor_set_uint8(x_38, sizeof(void*)*9 + 1, x_21);
+lean_ctor_set_uint8(x_38, sizeof(void*)*9 + 2, x_22);
+lean_ctor_set_uint8(x_38, sizeof(void*)*9 + 3, x_27);
+lean_ctor_set_uint8(x_38, sizeof(void*)*9 + 4, x_28);
+lean_ctor_set_uint8(x_38, sizeof(void*)*9 + 5, x_29);
+lean_ctor_set_uint8(x_38, sizeof(void*)*9 + 6, x_30);
+lean_ctor_set_uint8(x_38, sizeof(void*)*9 + 7, x_31);
+lean_ctor_set_uint8(x_38, sizeof(void*)*9 + 8, x_34);
+lean_ctor_set_uint8(x_38, sizeof(void*)*9 + 9, x_35);
+x_39 = l_Lean_Elab_Tactic_evalTactic(x_2, x_3, x_4, x_38, x_6, x_7, x_8, x_9, x_10, x_11);
+return x_39;
 }
 }
 }

stage0/stdlib/Lean/Elab/Tactic/Repeat.c

@@ -16,11 +16,13 @@ extern "C" {
 lean_object* l_Lean_KeyedDeclsAttribute_addBuiltin___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Elab_Tactic_evalRepeat_x27___spec__6___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_mk_empty_array_with_capacity(lean_object*);
+static lean_object* l_Lean_observing_x3f___at_Lean_Elab_Tactic_evalRepeat_x27___spec__5___closed__1;
 static lean_object* l_Lean_Elab_Tactic_evalRepeat_x27___closed__5;
 static lean_object* l_Lean_Meta_repeat_x27Core___at_Lean_Elab_Tactic_evalRepeat_x27___spec__3___closed__2;
 LEAN_EXPORT lean_object* l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Tactic_evalRepeat_x27___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalRepeat_x27_declRange___closed__3;
 lean_object* l_Lean_MVarId_isAssigned___at_Lean_Elab_Tactic_pruneSolvedGoals___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+uint8_t l_Lean_Exception_isInterrupt(lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalRepeat1_x27_declRange___closed__4;
 extern lean_object* l_Lean_Elab_Tactic_tacticElabAttribute;
 lean_object* lean_array_push(lean_object*, lean_object*);
@@ -143,22 +145,35 @@ x_9 = lean_alloc_closure((void*)(l_Lean_Elab_throwUnsupportedSyntax___at_Lean_El
 return x_9;
 }
 }
+static lean_object* _init_l_Lean_observing_x3f___at_Lean_Elab_Tactic_evalRepeat_x27___spec__5___closed__1() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = lean_box(0);
+x_2 = lean_box(0);
+x_3 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_3, 0, x_1);
+lean_ctor_set(x_3, 1, x_2);
+return x_3;
+}
+}
 LEAN_EXPORT lean_object* l_Lean_observing_x3f___at_Lean_Elab_Tactic_evalRepeat_x27___spec__5(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
 _start:
 {
-lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; 
-x_11 = l_Lean_Elab_Tactic_saveState___rarg(x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
-x_12 = lean_ctor_get(x_11, 0);
-lean_inc(x_12);
-x_13 = lean_ctor_get(x_11, 1);
-lean_inc(x_13);
-lean_dec(x_11);
-x_14 = l_Lean_Elab_Tactic_saveState___rarg(x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_13);
-x_15 = lean_ctor_get(x_14, 0);
-lean_inc(x_15);
-x_16 = lean_ctor_get(x_14, 1);
-lean_inc(x_16);
-lean_dec(x_14);
+lean_object* x_11; lean_object* x_12; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; uint8_t x_29; 
+x_25 = l_Lean_Elab_Tactic_saveState___rarg(x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
+x_26 = lean_ctor_get(x_25, 0);
+lean_inc(x_26);
+x_27 = lean_ctor_get(x_25, 1);
+lean_inc(x_27);
+lean_dec(x_25);
+x_28 = l_Lean_Elab_Tactic_saveState___rarg(x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_27);
+x_29 = !lean_is_exclusive(x_28);
+if (x_29 == 0)
+{
+lean_object* x_30; lean_object* x_31; lean_object* x_32; 
+x_30 = lean_ctor_get(x_28, 0);
+x_31 = lean_ctor_get(x_28, 1);
 lean_inc(x_9);
 lean_inc(x_8);
 lean_inc(x_7);
@@ -167,12 +182,12 @@ lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_3);
 lean_inc(x_2);
-x_17 = lean_apply_9(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_16);
-if (lean_obj_tag(x_17) == 0)
+x_32 = lean_apply_9(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_31);
+if (lean_obj_tag(x_32) == 0)
 {
-uint8_t x_18; 
-lean_dec(x_15);
-lean_dec(x_12);
+lean_object* x_33; lean_object* x_34; lean_object* x_35; 
+lean_dec(x_30);
+lean_dec(x_26);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
@@ -181,88 +196,79 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_18 = !lean_is_exclusive(x_17);
-if (x_18 == 0)
-{
-lean_object* x_19; lean_object* x_20; 
-x_19 = lean_ctor_get(x_17, 0);
-x_20 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_20, 0, x_19);
-lean_ctor_set(x_17, 0, x_20);
-return x_17;
+x_33 = lean_ctor_get(x_32, 0);
+lean_inc(x_33);
+x_34 = lean_ctor_get(x_32, 1);
+lean_inc(x_34);
+lean_dec(x_32);
+x_35 = lean_box(0);
+lean_ctor_set(x_28, 1, x_35);
+lean_ctor_set(x_28, 0, x_33);
+x_11 = x_28;
+x_12 = x_34;
+goto block_24;
 }
 else
 {
-lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; 
-x_21 = lean_ctor_get(x_17, 0);
-x_22 = lean_ctor_get(x_17, 1);
-lean_inc(x_22);
-lean_inc(x_21);
-lean_dec(x_17);
-x_23 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_23, 0, x_21);
-x_24 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_24, 0, x_23);
-lean_ctor_set(x_24, 1, x_22);
-return x_24;
-}
-}
-else
+uint8_t x_36; 
+lean_free_object(x_28);
+x_36 = !lean_is_exclusive(x_32);
+if (x_36 == 0)
 {
-uint8_t x_25; 
-x_25 = !lean_is_exclusive(x_17);
-if (x_25 == 0)
+lean_object* x_37; lean_object* x_38; uint8_t x_39; 
+x_37 = lean_ctor_get(x_32, 0);
+x_38 = lean_ctor_get(x_32, 1);
+x_39 = l_Lean_Exception_isInterrupt(x_37);
+if (x_39 == 0)
 {
-lean_object* x_26; lean_object* x_27; uint8_t x_28; 
-x_26 = lean_ctor_get(x_17, 0);
-x_27 = lean_ctor_get(x_17, 1);
-x_28 = l_Lean_Exception_isRuntime(x_26);
-if (x_28 == 0)
+uint8_t x_40; 
+x_40 = l_Lean_Exception_isRuntime(x_37);
+if (x_40 == 0)
 {
-uint8_t x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; uint8_t x_33; 
-lean_free_object(x_17);
-lean_dec(x_26);
-x_29 = 0;
+uint8_t x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; 
+lean_free_object(x_32);
+lean_dec(x_37);
+x_41 = 0;
 lean_inc(x_9);
 lean_inc(x_8);
 lean_inc(x_7);
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
-x_30 = l_Lean_Elab_Tactic_SavedState_restore(x_15, x_29, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_27);
-x_31 = lean_ctor_get(x_30, 1);
-lean_inc(x_31);
-lean_dec(x_30);
-x_32 = l_Lean_Elab_Tactic_SavedState_restore(x_12, x_29, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_31);
+x_42 = l_Lean_Elab_Tactic_SavedState_restore(x_30, x_41, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_38);
+x_43 = lean_ctor_get(x_42, 1);
+lean_inc(x_43);
+lean_dec(x_42);
+x_44 = l_Lean_Elab_Tactic_SavedState_restore(x_26, x_41, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_43);
 lean_dec(x_3);
 lean_dec(x_2);
-x_33 = !lean_is_exclusive(x_32);
-if (x_33 == 0)
+x_45 = lean_ctor_get(x_44, 1);
+lean_inc(x_45);
+lean_dec(x_44);
+x_46 = l_Lean_observing_x3f___at_Lean_Elab_Tactic_evalRepeat_x27___spec__5___closed__1;
+x_11 = x_46;
+x_12 = x_45;
+goto block_24;
+}
+else
 {
-lean_object* x_34; lean_object* x_35; 
-x_34 = lean_ctor_get(x_32, 0);
-lean_dec(x_34);
-x_35 = lean_box(0);
-lean_ctor_set(x_32, 0, x_35);
+lean_dec(x_30);
+lean_dec(x_26);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
 return x_32;
 }
-else
-{
-lean_object* x_36; lean_object* x_37; lean_object* x_38; 
-x_36 = lean_ctor_get(x_32, 1);
-lean_inc(x_36);
-lean_dec(x_32);
-x_37 = lean_box(0);
-x_38 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_38, 0, x_37);
-lean_ctor_set(x_38, 1, x_36);
-return x_38;
-}
 }
 else
 {
-lean_dec(x_15);
-lean_dec(x_12);
+lean_dec(x_30);
+lean_dec(x_26);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
@@ -271,61 +277,53 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-return x_17;
+return x_32;
 }
 }
 else
 {
-lean_object* x_39; lean_object* x_40; uint8_t x_41; 
-x_39 = lean_ctor_get(x_17, 0);
-x_40 = lean_ctor_get(x_17, 1);
-lean_inc(x_40);
-lean_inc(x_39);
-lean_dec(x_17);
-x_41 = l_Lean_Exception_isRuntime(x_39);
-if (x_41 == 0)
+lean_object* x_47; lean_object* x_48; uint8_t x_49; 
+x_47 = lean_ctor_get(x_32, 0);
+x_48 = lean_ctor_get(x_32, 1);
+lean_inc(x_48);
+lean_inc(x_47);
+lean_dec(x_32);
+x_49 = l_Lean_Exception_isInterrupt(x_47);
+if (x_49 == 0)
 {
-uint8_t x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; 
-lean_dec(x_39);
-x_42 = 0;
+uint8_t x_50; 
+x_50 = l_Lean_Exception_isRuntime(x_47);
+if (x_50 == 0)
+{
+uint8_t x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; 
+lean_dec(x_47);
+x_51 = 0;
 lean_inc(x_9);
 lean_inc(x_8);
 lean_inc(x_7);
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
-x_43 = l_Lean_Elab_Tactic_SavedState_restore(x_15, x_42, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_40);
-x_44 = lean_ctor_get(x_43, 1);
-lean_inc(x_44);
-lean_dec(x_43);
-x_45 = l_Lean_Elab_Tactic_SavedState_restore(x_12, x_42, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_44);
+x_52 = l_Lean_Elab_Tactic_SavedState_restore(x_30, x_51, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_48);
+x_53 = lean_ctor_get(x_52, 1);
+lean_inc(x_53);
+lean_dec(x_52);
+x_54 = l_Lean_Elab_Tactic_SavedState_restore(x_26, x_51, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_53);
 lean_dec(x_3);
 lean_dec(x_2);
-x_46 = lean_ctor_get(x_45, 1);
-lean_inc(x_46);
-if (lean_is_exclusive(x_45)) {
- lean_ctor_release(x_45, 0);
- lean_ctor_release(x_45, 1);
- x_47 = x_45;
-} else {
- lean_dec_ref(x_45);
- x_47 = lean_box(0);
-}
-x_48 = lean_box(0);
-if (lean_is_scalar(x_47)) {
- x_49 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_49 = x_47;
-}
-lean_ctor_set(x_49, 0, x_48);
-lean_ctor_set(x_49, 1, x_46);
-return x_49;
+x_55 = lean_ctor_get(x_54, 1);
+lean_inc(x_55);
+lean_dec(x_54);
+x_56 = l_Lean_observing_x3f___at_Lean_Elab_Tactic_evalRepeat_x27___spec__5___closed__1;
+x_11 = x_56;
+x_12 = x_55;
+goto block_24;
 }
 else
 {
-lean_object* x_50; 
-lean_dec(x_15);
-lean_dec(x_12);
+lean_object* x_57; 
+lean_dec(x_30);
+lean_dec(x_26);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
@@ -334,10 +332,225 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_50 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_50, 0, x_39);
-lean_ctor_set(x_50, 1, x_40);
-return x_50;
+x_57 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_57, 0, x_47);
+lean_ctor_set(x_57, 1, x_48);
+return x_57;
+}
+}
+else
+{
+lean_object* x_58; 
+lean_dec(x_30);
+lean_dec(x_26);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_58 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_58, 0, x_47);
+lean_ctor_set(x_58, 1, x_48);
+return x_58;
+}
+}
+}
+}
+else
+{
+lean_object* x_59; lean_object* x_60; lean_object* x_61; 
+x_59 = lean_ctor_get(x_28, 0);
+x_60 = lean_ctor_get(x_28, 1);
+lean_inc(x_60);
+lean_inc(x_59);
+lean_dec(x_28);
+lean_inc(x_9);
+lean_inc(x_8);
+lean_inc(x_7);
+lean_inc(x_6);
+lean_inc(x_5);
+lean_inc(x_4);
+lean_inc(x_3);
+lean_inc(x_2);
+x_61 = lean_apply_9(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_60);
+if (lean_obj_tag(x_61) == 0)
+{
+lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; 
+lean_dec(x_59);
+lean_dec(x_26);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_62 = lean_ctor_get(x_61, 0);
+lean_inc(x_62);
+x_63 = lean_ctor_get(x_61, 1);
+lean_inc(x_63);
+lean_dec(x_61);
+x_64 = lean_box(0);
+x_65 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_65, 0, x_62);
+lean_ctor_set(x_65, 1, x_64);
+x_11 = x_65;
+x_12 = x_63;
+goto block_24;
+}
+else
+{
+lean_object* x_66; lean_object* x_67; lean_object* x_68; uint8_t x_69; 
+x_66 = lean_ctor_get(x_61, 0);
+lean_inc(x_66);
+x_67 = lean_ctor_get(x_61, 1);
+lean_inc(x_67);
+if (lean_is_exclusive(x_61)) {
+ lean_ctor_release(x_61, 0);
+ lean_ctor_release(x_61, 1);
+ x_68 = x_61;
+} else {
+ lean_dec_ref(x_61);
+ x_68 = lean_box(0);
+}
+x_69 = l_Lean_Exception_isInterrupt(x_66);
+if (x_69 == 0)
+{
+uint8_t x_70; 
+x_70 = l_Lean_Exception_isRuntime(x_66);
+if (x_70 == 0)
+{
+uint8_t x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; 
+lean_dec(x_68);
+lean_dec(x_66);
+x_71 = 0;
+lean_inc(x_9);
+lean_inc(x_8);
+lean_inc(x_7);
+lean_inc(x_6);
+lean_inc(x_5);
+lean_inc(x_4);
+x_72 = l_Lean_Elab_Tactic_SavedState_restore(x_59, x_71, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_67);
+x_73 = lean_ctor_get(x_72, 1);
+lean_inc(x_73);
+lean_dec(x_72);
+x_74 = l_Lean_Elab_Tactic_SavedState_restore(x_26, x_71, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_73);
+lean_dec(x_3);
+lean_dec(x_2);
+x_75 = lean_ctor_get(x_74, 1);
+lean_inc(x_75);
+lean_dec(x_74);
+x_76 = l_Lean_observing_x3f___at_Lean_Elab_Tactic_evalRepeat_x27___spec__5___closed__1;
+x_11 = x_76;
+x_12 = x_75;
+goto block_24;
+}
+else
+{
+lean_object* x_77; 
+lean_dec(x_59);
+lean_dec(x_26);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+if (lean_is_scalar(x_68)) {
+ x_77 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_77 = x_68;
+}
+lean_ctor_set(x_77, 0, x_66);
+lean_ctor_set(x_77, 1, x_67);
+return x_77;
+}
+}
+else
+{
+lean_object* x_78; 
+lean_dec(x_59);
+lean_dec(x_26);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+if (lean_is_scalar(x_68)) {
+ x_78 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_78 = x_68;
+}
+lean_ctor_set(x_78, 0, x_66);
+lean_ctor_set(x_78, 1, x_67);
+return x_78;
+}
+}
+}
+block_24:
+{
+if (lean_obj_tag(x_11) == 0)
+{
+uint8_t x_13; 
+x_13 = !lean_is_exclusive(x_11);
+if (x_13 == 0)
+{
+lean_object* x_14; lean_object* x_15; lean_object* x_16; 
+x_14 = lean_ctor_get(x_11, 0);
+x_15 = lean_ctor_get(x_11, 1);
+lean_dec(x_15);
+x_16 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_16, 0, x_14);
+lean_ctor_set(x_11, 1, x_12);
+lean_ctor_set(x_11, 0, x_16);
+return x_11;
+}
+else
+{
+lean_object* x_17; lean_object* x_18; lean_object* x_19; 
+x_17 = lean_ctor_get(x_11, 0);
+lean_inc(x_17);
+lean_dec(x_11);
+x_18 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_18, 0, x_17);
+x_19 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_19, 0, x_18);
+lean_ctor_set(x_19, 1, x_12);
+return x_19;
+}
+}
+else
+{
+uint8_t x_20; 
+x_20 = !lean_is_exclusive(x_11);
+if (x_20 == 0)
+{
+lean_object* x_21; 
+x_21 = lean_ctor_get(x_11, 1);
+lean_dec(x_21);
+lean_ctor_set_tag(x_11, 0);
+lean_ctor_set(x_11, 1, x_12);
+return x_11;
+}
+else
+{
+lean_object* x_22; lean_object* x_23; 
+x_22 = lean_ctor_get(x_11, 0);
+lean_inc(x_22);
+lean_dec(x_11);
+x_23 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_23, 0, x_22);
+lean_ctor_set(x_23, 1, x_12);
+return x_23;
 }
 }
 }
@@ -2287,6 +2500,8 @@ l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Tactic_evalRepeat_x27___spec__
 lean_mark_persistent(l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Tactic_evalRepeat_x27___spec__1___rarg___closed__1);
 l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Tactic_evalRepeat_x27___spec__1___rarg___closed__2 = _init_l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Tactic_evalRepeat_x27___spec__1___rarg___closed__2();
 lean_mark_persistent(l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Tactic_evalRepeat_x27___spec__1___rarg___closed__2);
+l_Lean_observing_x3f___at_Lean_Elab_Tactic_evalRepeat_x27___spec__5___closed__1 = _init_l_Lean_observing_x3f___at_Lean_Elab_Tactic_evalRepeat_x27___spec__5___closed__1();
+lean_mark_persistent(l_Lean_observing_x3f___at_Lean_Elab_Tactic_evalRepeat_x27___spec__5___closed__1);
 l_Lean_Meta_repeat_x27Core___at_Lean_Elab_Tactic_evalRepeat_x27___spec__3___closed__1 = _init_l_Lean_Meta_repeat_x27Core___at_Lean_Elab_Tactic_evalRepeat_x27___spec__3___closed__1();
 lean_mark_persistent(l_Lean_Meta_repeat_x27Core___at_Lean_Elab_Tactic_evalRepeat_x27___spec__3___closed__1);
 l_Lean_Meta_repeat_x27Core___at_Lean_Elab_Tactic_evalRepeat_x27___spec__3___closed__2 = _init_l_Lean_Meta_repeat_x27Core___at_Lean_Elab_Tactic_evalRepeat_x27___spec__3___closed__2();

stage0/stdlib/Lean/Elab/Tactic/Rewrites.c

@@ -1148,6 +1148,7 @@ lean_inc(x_33);
 lean_dec(x_31);
 x_34 = l_Lean_Elab_Rewrites_evalExact___lambda__2___closed__2;
 x_35 = lean_unsigned_to_nat(90u);
+lean_inc(x_14);
 lean_inc(x_13);
 lean_inc(x_5);
 x_36 = l_Lean_reportOutOfHeartbeats(x_34, x_5, x_35, x_13, x_14, x_33);
@@ -1475,6 +1476,7 @@ lean_inc(x_101);
 lean_dec(x_99);
 x_102 = l_Lean_Elab_Rewrites_evalExact___lambda__2___closed__2;
 x_103 = lean_unsigned_to_nat(90u);
+lean_inc(x_14);
 lean_inc(x_13);
 lean_inc(x_5);
 x_104 = l_Lean_reportOutOfHeartbeats(x_102, x_5, x_103, x_13, x_14, x_101);
@@ -3165,6 +3167,7 @@ lean_inc(x_30);
 lean_dec(x_28);
 x_31 = l_Lean_Elab_Rewrites_evalExact___lambda__2___closed__2;
 x_32 = lean_unsigned_to_nat(90u);
+lean_inc(x_12);
 lean_inc(x_11);
 lean_inc(x_4);
 x_33 = l_Lean_reportOutOfHeartbeats(x_31, x_4, x_32, x_11, x_12, x_30);
@@ -3429,6 +3432,7 @@ lean_dec(x_16);
 x_19 = 0;
 x_20 = l_Lean_Elab_Rewrites_evalExact___lambda__7___closed__3;
 x_21 = lean_unsigned_to_nat(90u);
+lean_inc(x_12);
 lean_inc(x_11);
 lean_inc(x_1);
 x_22 = l_Lean_reportOutOfHeartbeats(x_20, x_1, x_21, x_11, x_12, x_18);

stage0/stdlib/Lean/Elab/Tactic/SimpTrace.c

@@ -372,8 +372,6 @@ x_35 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_35, 0, x_31);
 x_36 = l_Lean_Elab_Tactic_evalSimpTrace___lambda__2___closed__4;
 x_37 = l_Lean_Meta_Tactic_TryThis_addSuggestion(x_2, x_34, x_35, x_36, x_33, x_8, x_9, x_10, x_11, x_30);
-lean_dec(x_9);
-lean_dec(x_8);
 if (lean_obj_tag(x_37) == 0)
 {
 uint8_t x_38; 
@@ -454,8 +452,6 @@ x_55 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_55, 0, x_50);
 x_56 = l_Lean_Elab_Tactic_evalSimpTrace___lambda__2___closed__4;
 x_57 = l_Lean_Meta_Tactic_TryThis_addSuggestion(x_2, x_54, x_55, x_56, x_53, x_8, x_9, x_10, x_11, x_49);
-lean_dec(x_9);
-lean_dec(x_8);
 if (lean_obj_tag(x_57) == 0)
 {
 lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; 
@@ -2207,8 +2203,6 @@ x_23 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_23, 0, x_19);
 x_24 = l_Lean_Elab_Tactic_evalSimpTrace___lambda__2___closed__4;
 x_25 = l_Lean_Meta_Tactic_TryThis_addSuggestion(x_3, x_22, x_23, x_24, x_21, x_9, x_10, x_11, x_12, x_18);
-lean_dec(x_10);
-lean_dec(x_9);
 if (lean_obj_tag(x_25) == 0)
 {
 uint8_t x_26; 
@@ -2289,8 +2283,6 @@ x_43 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_43, 0, x_38);
 x_44 = l_Lean_Elab_Tactic_evalSimpTrace___lambda__2___closed__4;
 x_45 = l_Lean_Meta_Tactic_TryThis_addSuggestion(x_3, x_42, x_43, x_44, x_41, x_9, x_10, x_11, x_12, x_37);
-lean_dec(x_10);
-lean_dec(x_9);
 if (lean_obj_tag(x_45) == 0)
 {
 lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; 
@@ -4897,8 +4889,6 @@ x_38 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_38, 0, x_34);
 x_39 = l_Lean_Elab_Tactic_evalSimpTrace___lambda__2___closed__4;
 x_40 = l_Lean_Meta_Tactic_TryThis_addSuggestion(x_1, x_37, x_38, x_39, x_36, x_8, x_9, x_10, x_11, x_33);
-lean_dec(x_9);
-lean_dec(x_8);
 if (lean_obj_tag(x_40) == 0)
 {
 uint8_t x_41; 
@@ -4979,8 +4969,6 @@ x_58 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_58, 0, x_53);
 x_59 = l_Lean_Elab_Tactic_evalSimpTrace___lambda__2___closed__4;
 x_60 = l_Lean_Meta_Tactic_TryThis_addSuggestion(x_1, x_57, x_58, x_59, x_56, x_8, x_9, x_10, x_11, x_52);
-lean_dec(x_9);
-lean_dec(x_8);
 if (lean_obj_tag(x_60) == 0)
 {
 lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; 

stage0/stdlib/Lean/Elab/Tactic/Simpa.c

@@ -879,6 +879,8 @@ lean_ctor_set(x_18, 0, x_13);
 x_19 = l_Lean_Elab_Tactic_Simpa_evalSimpa___lambda__3___closed__3;
 lean_inc(x_11);
 lean_inc(x_10);
+lean_inc(x_9);
+lean_inc(x_8);
 x_20 = l_Lean_Meta_Tactic_TryThis_addSuggestion(x_1, x_17, x_18, x_19, x_16, x_8, x_9, x_10, x_11, x_12);
 if (lean_obj_tag(x_20) == 0)
 {
@@ -2843,13 +2845,7 @@ lean_ctor_set(x_42, 0, x_40);
 lean_ctor_set(x_42, 1, x_41);
 x_43 = l_Lean_Linter_logLint___at_Lean_Elab_Tactic_Simpa_evalSimpa___spec__1(x_31, x_35, x_42, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_25);
 lean_dec(x_13);
-lean_dec(x_11);
 lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_35);
 x_44 = !lean_is_exclusive(x_43);
 if (x_44 == 0)
 {
@@ -2948,13 +2944,7 @@ lean_ctor_set(x_62, 0, x_60);
 lean_ctor_set(x_62, 1, x_61);
 x_63 = l_Lean_Linter_logLint___at_Lean_Elab_Tactic_Simpa_evalSimpa___spec__1(x_50, x_54, x_62, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_25);
 lean_dec(x_13);
-lean_dec(x_11);
 lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_54);
 x_64 = lean_ctor_get(x_63, 1);
 lean_inc(x_64);
 if (lean_is_exclusive(x_63)) {
@@ -3074,13 +3064,7 @@ lean_ctor_set(x_85, 0, x_83);
 lean_ctor_set(x_85, 1, x_84);
 x_86 = l_Lean_Linter_logLint___at_Lean_Elab_Tactic_Simpa_evalSimpa___spec__1(x_71, x_77, x_85, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_67);
 lean_dec(x_13);
-lean_dec(x_11);
 lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_77);
 x_87 = lean_ctor_get(x_86, 1);
 lean_inc(x_87);
 if (lean_is_exclusive(x_86)) {
@@ -3470,13 +3454,7 @@ lean_ctor_set(x_162, 0, x_160);
 lean_ctor_set(x_162, 1, x_161);
 x_163 = l_Lean_Linter_logLint___at_Lean_Elab_Tactic_Simpa_evalSimpa___spec__1(x_147, x_153, x_162, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_142);
 lean_dec(x_13);
-lean_dec(x_11);
 lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_153);
 x_164 = lean_ctor_get(x_163, 1);
 lean_inc(x_164);
 if (lean_is_exclusive(x_163)) {
@@ -4549,13 +4527,7 @@ lean_inc(x_36);
 x_37 = l_Lean_Elab_Tactic_Simpa_evalSimpa___lambda__11___closed__15;
 x_38 = l_Lean_Linter_logLint___at_Lean_Elab_Tactic_Simpa_evalSimpa___spec__1(x_33, x_36, x_37, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18, x_30);
 lean_dec(x_18);
-lean_dec(x_16);
 lean_dec(x_15);
-lean_dec(x_14);
-lean_dec(x_13);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_36);
 x_39 = !lean_is_exclusive(x_38);
 if (x_39 == 0)
 {
@@ -4616,13 +4588,7 @@ lean_inc(x_51);
 x_52 = l_Lean_Elab_Tactic_Simpa_evalSimpa___lambda__11___closed__15;
 x_53 = l_Lean_Linter_logLint___at_Lean_Elab_Tactic_Simpa_evalSimpa___spec__1(x_47, x_51, x_52, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18, x_45);
 lean_dec(x_18);
-lean_dec(x_16);
 lean_dec(x_15);
-lean_dec(x_14);
-lean_dec(x_13);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_51);
 x_54 = lean_ctor_get(x_53, 1);
 lean_inc(x_54);
 if (lean_is_exclusive(x_53)) {
@@ -6143,13 +6109,7 @@ _start:
 lean_object* x_13; 
 x_13 = l_Lean_Linter_logLint___at_Lean_Elab_Tactic_Simpa_evalSimpa___spec__1(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12);
 lean_dec(x_11);
-lean_dec(x_9);
 lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_2);
 return x_13;
 }
 }

stage0/stdlib/Lean/Elab/Tactic/Simproc.c

@@ -346,7 +346,7 @@ x_4 = 1;
 x_5 = 0;
 x_6 = l_Lean_Elab_elabSimprocPattern___closed__3;
 x_7 = l_Lean_Elab_elabSimprocPattern___closed__4;
-x_8 = lean_alloc_ctor(0, 8, 10);
+x_8 = lean_alloc_ctor(0, 9, 10);
 lean_ctor_set(x_8, 0, x_1);
 lean_ctor_set(x_8, 1, x_2);
 lean_ctor_set(x_8, 2, x_3);
@@ -355,16 +355,17 @@ lean_ctor_set(x_8, 4, x_7);
 lean_ctor_set(x_8, 5, x_2);
 lean_ctor_set(x_8, 6, x_2);
 lean_ctor_set(x_8, 7, x_1);
-lean_ctor_set_uint8(x_8, sizeof(void*)*8, x_4);
-lean_ctor_set_uint8(x_8, sizeof(void*)*8 + 1, x_4);
-lean_ctor_set_uint8(x_8, sizeof(void*)*8 + 2, x_5);
-lean_ctor_set_uint8(x_8, sizeof(void*)*8 + 3, x_4);
-lean_ctor_set_uint8(x_8, sizeof(void*)*8 + 4, x_4);
-lean_ctor_set_uint8(x_8, sizeof(void*)*8 + 5, x_5);
-lean_ctor_set_uint8(x_8, sizeof(void*)*8 + 6, x_5);
-lean_ctor_set_uint8(x_8, sizeof(void*)*8 + 7, x_5);
-lean_ctor_set_uint8(x_8, sizeof(void*)*8 + 8, x_4);
-lean_ctor_set_uint8(x_8, sizeof(void*)*8 + 9, x_5);
+lean_ctor_set(x_8, 8, x_1);
+lean_ctor_set_uint8(x_8, sizeof(void*)*9, x_4);
+lean_ctor_set_uint8(x_8, sizeof(void*)*9 + 1, x_4);
+lean_ctor_set_uint8(x_8, sizeof(void*)*9 + 2, x_5);
+lean_ctor_set_uint8(x_8, sizeof(void*)*9 + 3, x_4);
+lean_ctor_set_uint8(x_8, sizeof(void*)*9 + 4, x_4);
+lean_ctor_set_uint8(x_8, sizeof(void*)*9 + 5, x_5);
+lean_ctor_set_uint8(x_8, sizeof(void*)*9 + 6, x_5);
+lean_ctor_set_uint8(x_8, sizeof(void*)*9 + 7, x_5);
+lean_ctor_set_uint8(x_8, sizeof(void*)*9 + 8, x_4);
+lean_ctor_set_uint8(x_8, sizeof(void*)*9 + 9, x_5);
 return x_8;
 }
 }