erts: Move max_heap_size field so that ErLLVM works again

1 files changed, 27 insertions, 0 deletions

diff --git a/erts/emulator/hipe/hipe_mode_switch.c b/erts/emulator/hipe/hipe_mode_switch.c
index f532d3151f..884331e969 100644
--- a/erts/emulator/hipe/hipe_mode_switch.c
+++ b/erts/emulator/hipe/hipe_mode_switch.c
@@ -174,6 +174,33 @@ void hipe_mode_switch_init(void)
 	make_catch(beam_catches_cons(hipe_beam_pc_throw, BEAM_CATCHES_NIL));
 
     hipe_mfa_info_table_init();
+
+#if (defined(__i386__) || defined(__x86_64__)) && defined(__linux__)
+    /* Verify that the offset of c-p->hipe does not change.
+       The ErLLVM hipe backend depends on it being in a specific
+       position. Kostis et al has promised to fix this in upstream
+       llvm by OTP 20, so it should be possible to remove these asserts
+       after that. */
+    ERTS_CT_ASSERT(sizeof(ErtsPTabElementCommon) ==
+                   (sizeof(Eterm) +                   /* id */
+                    sizeof(((ErtsPTabElementCommon*)0)->refc) +
+                    sizeof(ErtsTracer) +              /* tracer */
+                    sizeof(Uint) +                    /* trace_flags */
+                    sizeof(erts_smp_atomic_t) +       /* timer */
+                    sizeof(((ErtsPTabElementCommon*)0)->u)));
+
+    ERTS_CT_ASSERT(offsetof(Process, hipe) ==
+                   (sizeof(ErtsPTabElementCommon) +   /* common */
+                    sizeof(Eterm*) +                  /* htop */
+                    sizeof(Eterm*) +                  /* stop */
+                    sizeof(Eterm*) +                  /* heap */
+                    sizeof(Eterm*) +                  /* hend */
+                    sizeof(Uint) +                    /* heap_sz */
+                    sizeof(Uint) +                    /* min_heap_size */
+                    sizeof(Uint) +                    /* min_vheap_size */
+                    sizeof(volatile unsigned long))); /* fp_exception */
+#endif
+
 }
 
 void hipe_set_call_trap(Uint *bfun, void *nfun, int is_closure)