hot patch for win64 alignment error segfault

this makes the taggedvalue struct a multiple of 16-bytes (on 64-bit platforms) so that the 16-byte gc-alignment is maintained, until we can fix the gc to hand out better aligned pointers
JuliaLang · Mar 21, 2015 · 0d8cec3 · 0d8cec3 · carnaval · Apr 2, 2015
1 parent 7d433e8
commit 0d8cec3
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 21 deletions.
diff --git a/src/gc.c b/src/gc.c
@@ -2318,7 +2318,7 @@ void *reallocb(void *b, size_t sz)
 
 DLLEXPORT jl_value_t *allocobj(size_t sz)
 {
-    sz += sizeof(void*);
+    sz += sizeof(jl_taggedvalue_t);
 #ifdef MEMDEBUG
     return jl_valueof(alloc_big(sz));
 #endif
@@ -2330,39 +2330,29 @@ DLLEXPORT jl_value_t *allocobj(size_t sz)
 
 DLLEXPORT jl_value_t *alloc_1w(void)
 {
+    const int sz = sizeof(jl_taggedvalue_t) + sizeof(void*);
 #ifdef MEMDEBUG
-    return jl_valueof(alloc_big(2*sizeof(void*)));
-#endif
-#ifdef _P64
-    return jl_valueof(_pool_alloc(&pools[2], 2*sizeof(void*)));
-#else
-    return jl_valueof(_pool_alloc(&pools[0], 2*sizeof(void*)));
+    return jl_valueof(alloc_big(sz));
 #endif
+    return jl_valueof(_pool_alloc(&pools[szclass(sz)], sz));
 }
 
 DLLEXPORT jl_value_t *alloc_2w(void)
 {
+    const int sz = sizeof(jl_taggedvalue_t) + sizeof(void*) * 2;
 #ifdef MEMDEBUG
-    return jl_valueof(alloc_big(3*sizeof(void*)));
-#endif
-#ifdef _P64
-    return jl_valueof(_pool_alloc(&pools[4], 3*sizeof(void*)));
-#else
-    return jl_valueof(_pool_alloc(&pools[1], 3*sizeof(void*)));
+    return jl_valueof(alloc_big(sz));
 #endif
-
+    return jl_valueof(_pool_alloc(&pools[szclass(sz)], sz));
 }
 
 DLLEXPORT jl_value_t *alloc_3w(void)
 {
+    const int sz = sizeof(jl_taggedvalue_t) + sizeof(void*) * 3;
 #ifdef MEMDEBUG
-    return jl_valueof(alloc_big(4*sizeof(void*)));
-#endif
-#ifdef _P64
-    return jl_valueof(_pool_alloc(&pools[6], 4*sizeof(void*)));
-#else
-    return jl_valueof(pool_alloc(&pools[2]));
+    return jl_valueof(alloc_big(sz));
 #endif
+    return jl_valueof(_pool_alloc(&pools[szclass(sz)], sz));
 }
 
 #ifdef GC_FINAL_STATS

diff --git a/src/julia.h b/src/julia.h
@@ -80,14 +80,25 @@ typedef struct {
 #endif
         };
     };
+#ifdef _P64
+    uintptr_t realign16;
+#endif
     jl_value_t value[0];
 } jl_taggedvalue_t;
 
 #define jl_astaggedvalue__MACRO(v) container_of((v),jl_taggedvalue_t,value)
 #define jl_typeof__MACRO(v) ((jl_value_t*)(jl_astaggedvalue__MACRO(v)->type_bits&~(size_t)3))
 #define jl_astaggedvalue jl_astaggedvalue__MACRO
 #define jl_typeof jl_typeof__MACRO
-#define jl_set_typeof(v,t) (jl_astaggedvalue(v)->type = (jl_value_t*)(t))
+//#define jl_set_typeof(v,t) (jl_astaggedvalue(v)->type = (jl_value_t*)(t))
+static inline void jl_set_typeof(void *v, void *t)
+{
+    jl_taggedvalue_t *tag = jl_astaggedvalue(v);
+#ifdef _P64
+    tag->realign16 = 0xA1164A1164A11640ull;
+#endif
+    tag->type = (jl_value_t*)t;
+}
 #define jl_typeis(v,t) (jl_typeof(v)==(jl_value_t*)(t))
 
 typedef struct _jl_sym_t {