test cycles made from weak symbols

src/coff/coff_obj_writer.c

@@ -149,6 +149,16 @@ coff_obj_writer_push_symbol_sect(COFF_ObjWriter *obj_writer, String8 name, COFF_
   return s;
 }
 
+internal COFF_ObjSymbol *
+coff_obj_writer_push_symbol_common(COFF_ObjWriter *obj_writer, String8 name, U32 size)
+{
+  COFF_SymbolType type = {0};
+  COFF_SymbolLocation loc = {0};
+  loc.type = COFF_SymbolLocation_Common;
+  COFF_ObjSymbol *s = coff_obj_writer_push_symbol(obj_writer, name, size, loc, type, COFF_SymStorageClass_External);
+  return s;
+}
+
 internal COFF_ObjSection *
 coff_obj_writer_push_section(COFF_ObjWriter *obj_writer, String8 name, COFF_SectionFlags flags, String8 data)
 {
@@ -264,9 +274,7 @@ coff_obj_writer_serialize(Arena *arena, COFF_ObjWriter *obj_writer)
 
       U64 start_symbol_idx = symbol_idx;
       if (s->storage_class == COFF_SymStorageClass_WeakExternal) {
-        Assert(s->aux_symbols.node_count <= 1);
+        if (s->aux_symbols.node_count > 0) {
-
-        if (s->aux_symbols.node_count == 1) {
           COFF_ObjSymbolWeak *s_weak = (COFF_ObjSymbolWeak *)s->aux_symbols.first->string.str;
           COFF_SymbolWeakExt *d_weak = push_array(scratch.arena, COFF_SymbolWeakExt, 1);
           d_weak->tag_index       = s_weak->tag->idx;
@@ -276,9 +284,7 @@ coff_obj_writer_serialize(Arena *arena, COFF_ObjWriter *obj_writer)
           symbol_idx += 1;
         }
       } else if (s->storage_class == COFF_SymStorageClass_Static) {
-        Assert(s->aux_symbols.node_count <= 1);
+        if (s->aux_symbols.node_count > 0) {
-
-        if (s->aux_symbols.node_count == 1) {
           Assert(s->loc.type == COFF_SymbolLocation_Section);
           COFF_ObjSection *sect = s->loc.u.section;
 
@@ -294,11 +300,16 @@ coff_obj_writer_serialize(Arena *arena, COFF_ObjWriter *obj_writer)
           str8_list_push(scratch.arena, &symbol_table, str8_struct(d_sd));
           symbol_idx += 1;
         }
-      } else {
-        Assert(s->aux_symbols.node_count == 0);
       }
 
-      d->aux_symbol_count = (U8)(symbol_idx - start_symbol_idx);
+      U8 processed_aux_symbol_count = (U8)(symbol_idx - start_symbol_idx);
+
+      for (U64 aux_idx = processed_aux_symbol_count; aux_idx < s->aux_symbols.node_count; aux_idx += 1) {
+        COFF_Symbol16 *a = push_array(scratch.arena, COFF_Symbol16, 1);
+        str8_list_push(scratch.arena, &symbol_table, str8_struct(a));
+      }
+
+      d->aux_symbol_count = (U8)s->aux_symbols.node_count;
     }
   }
 

src/coff/coff_obj_writer.h

@@ -6,7 +6,8 @@ typedef enum
   COFF_SymbolLocation_Null,
   COFF_SymbolLocation_Section,
   COFF_SymbolLocation_Abs,
-  COFF_SymbolLocation_Undef
+  COFF_SymbolLocation_Undef,
+  COFF_SymbolLocation_Common,
 } COFF_SymbolLocationType;
 
 typedef struct COFF_SymbolLocation

src/os/core/linux/os_core_linux.c

@@ -786,6 +786,12 @@ os_process_detach(OS_Handle handle)
   NotImplemented;
 }
 
+internal B32
+os_process_kill(OS_Handle handle)
+{
+  NotImplemented;
+}
+
 ////////////////////////////////
 //~ rjf: @os_hooks Threads (Implemented Per-OS)
 

src/os/core/os_core.h

@@ -257,6 +257,7 @@ internal OS_Handle os_process_launch(OS_ProcessLaunchParams *params);
 internal B32       os_process_join(OS_Handle handle, U64 endt_us);
 internal B32       os_process_join_exit_code(OS_Handle handle, U64 endt_us, int *exit_code_out);
 internal void      os_process_detach(OS_Handle handle);
+internal B32       os_process_kill(OS_Handle handle);
 
 ////////////////////////////////
 //~ rjf: @os_hooks Threads (Implemented Per-OS)

src/os/core/win32/os_core_win32.c

@@ -1086,6 +1086,14 @@ os_process_join_exit_code(OS_Handle handle, U64 endt_us, int *exit_code_out)
   return result; 
 }
 
+internal B32
+os_process_kill(OS_Handle handle)
+{
+  HANDLE process = (HANDLE)handle.u64[0];
+  BOOL was_terminated = TerminateProcess(process, 999);
+  return was_terminated;
+}
+
 internal void
 os_process_detach(OS_Handle handle)
 {

src/torture/torture.c

@@ -50,13 +50,42 @@ t_string_from_result(T_Result v)
   return 0;
 }
 
+global U64     g_linker_time_out;
 global String8 g_linker;
 global String8 g_wdir;
 global String8 g_out = str8_lit_comp("torture_out");
 global B32     g_verbose;
 
+#define T_LINKER_TIME_OUT_EXIT_CODE 999999
+
+typedef enum
+{
+  T_Linker_Null,
+  T_Linker_RAD,
+  T_Linker_MSVC,
+  T_Linker_LLVM
+} T_Linker;
+
+internal T_Linker
+t_ident_linker(void)
+{
+  String8 name = g_linker;
+  name = str8_skip_last_slash(name);
+  name = str8_chop_last_dot(name);
+  if (str8_match(name, str8_lit("radlink"), StringMatchFlag_CaseInsensitive)) {
+    return T_Linker_RAD;
+  }
+  if (str8_match(name, str8_lit("link"), StringMatchFlag_CaseInsensitive)) {
+    return T_Linker_MSVC;
+  }
+  if (str8_match(name, str8_lit("lld-link"), StringMatchFlag_CaseInsensitive)) {
+    return T_Linker_LLVM;
+  }
+  return T_Linker_Null;
+}
+
 internal int
-t_invoke_linker(String8 cmdline)
+t_invoke_linker_with_time_out(U64 time_out, String8 cmdline)
 {
   Temp scratch = scratch_begin(0,0);
 
@@ -88,8 +117,11 @@ t_invoke_linker(String8 cmdline)
     if (os_handle_match(linker_handle, os_handle_zero())) {
       fprintf(stderr, "unable to start process: %.*s\n", str8_varg(g_linker));
     } else {
-      B32 was_joined = os_process_join_exit_code(linker_handle, max_U64, &exit_code);
+      B32 was_joined = os_process_join_exit_code(linker_handle, os_now_microseconds() + time_out, &exit_code);
-      Assert(was_joined);
+      if (!was_joined) {
+        os_process_kill(linker_handle);
+        exit_code = T_LINKER_TIME_OUT_EXIT_CODE;
+      }
       os_process_detach(linker_handle);
     }
   }
@@ -98,6 +130,12 @@ t_invoke_linker(String8 cmdline)
   return exit_code;
 }
 
+internal int
+t_invoke_linker(String8 cmdline)
+{
+  return t_invoke_linker_with_time_out(max_U64, cmdline);
+}
+
 internal int
 t_invoke_linkerf(char *fmt, ...)
 {
@@ -111,6 +149,19 @@ t_invoke_linkerf(char *fmt, ...)
   return exit_code;
 }
 
+internal int
+t_invoke_linker_with_time_outf(U64 time_out, char *fmt, ...)
+{
+  Temp scratch = scratch_begin(0,0);
+  va_list args;
+  va_start(args, fmt);
+  String8 cmdline = push_str8fv(scratch.arena, fmt, args);
+  int exit_code = t_invoke_linker_with_time_out(time_out, cmdline);
+  va_end(args);
+  scratch_end(scratch);
+  return exit_code;
+}
+
 internal String8
 t_make_file_path(Arena *arena, String8 name)
 {
@@ -181,6 +232,11 @@ t_coff_section_header_from_name(String8 string_table, COFF_SectionHeader *sectio
 
 ////////////////////////////////////////////////////////////////
 
+typedef enum
+{
+  T_MsvcLinkExitCode_CorruptOrInvalidSymbolTable = 0x4d3,
+} T_MsvcLinkExitCode;
+
 internal COFF_ObjSection *
 t_push_text_section(COFF_ObjWriter *obj_writer, String8 data)
 {
@@ -190,13 +246,13 @@ t_push_text_section(COFF_ObjWriter *obj_writer, String8 data)
 internal COFF_ObjSection *
 t_push_data_section(COFF_ObjWriter *obj_writer, String8 data)
 {
-  return coff_obj_writer_push_section(obj_writer, str8_lit(".data"), COFF_SectionFlag_CntInitializedData|COFF_SectionFlag_MemRead|COFF_SectionFlag_MemWrite, data);
+  return coff_obj_writer_push_section(obj_writer, str8_lit(".data"), COFF_SectionFlag_CntInitializedData|COFF_SectionFlag_MemRead|COFF_SectionFlag_MemWrite|COFF_SectionFlag_Align1Bytes, data);
 }
 
 internal COFF_ObjSection *
 t_push_rdata_section(COFF_ObjWriter *obj_writer, String8 data)
 {
-  return coff_obj_writer_push_section(obj_writer, str8_lit(".rdata"), COFF_SectionFlag_CntInitializedData|COFF_SectionFlag_MemRead, data);
+  return coff_obj_writer_push_section(obj_writer, str8_lit(".rdata"), COFF_SectionFlag_CntInitializedData|COFF_SectionFlag_MemRead|COFF_SectionFlag_Align1Bytes, data);
 }
 
 internal T_Result
@@ -484,6 +540,82 @@ exit:;
   return result;
 }
 
+internal T_Result
+t_undef_weak(void)
+{
+  Temp scratch = scratch_begin(0,0);
+
+  T_Result result = T_Result_Fail;
+
+  String8 entry_symbol_name = str8_lit("my_entry");
+  String8 shared_symbol_name = str8_lit("foo");
+
+  U8 weak_payload[] = { 0xDE, 0xAD, 0xBE, 0xEF };
+  String8 weak_obj_name = str8_lit("weak.obj");
+  {
+    COFF_ObjWriter *obj_writer = coff_obj_writer_alloc(0, COFF_MachineType_X64);
+    COFF_ObjSection *weak_sect = t_push_data_section(obj_writer, str8_array_fixed(weak_payload));
+    COFF_ObjSymbol *tag = coff_obj_writer_push_symbol_undef(obj_writer, str8_lit("ptr"));
+    coff_obj_writer_push_symbol_weak(obj_writer, shared_symbol_name, COFF_WeakExt_SearchAlias, tag);
+    String8 weak_obj = coff_obj_writer_serialize(scratch.arena, obj_writer);
+    coff_obj_writer_release(&obj_writer);
+    if (!t_write_file(weak_obj_name, weak_obj)) {
+      goto exit;
+    }
+  }
+
+  String8 ptr_obj_name = str8_lit("ptr.obj");
+  {
+    COFF_ObjWriter *obj_writer = coff_obj_writer_alloc(0, COFF_MachineType_X64);
+    COFF_ObjSymbol *tag = coff_obj_writer_push_symbol_undef(obj_writer, entry_symbol_name);
+    coff_obj_writer_push_symbol_weak(obj_writer, str8_lit("ptr"), COFF_WeakExt_SearchAlias, tag);
+    String8 ptr_obj = coff_obj_writer_serialize(scratch.arena, obj_writer);
+    coff_obj_writer_release(&obj_writer);
+    if (!t_write_file(ptr_obj_name, ptr_obj)) {
+      goto exit;
+    }
+  }
+
+  U8 undef_obj_payload[] = { 0x00, 0x00, 0x00, 0x00 };
+  String8 undef_obj_name = str8_lit("undef.obj");
+  {
+    COFF_ObjWriter *obj_writer = coff_obj_writer_alloc(0, COFF_MachineType_X64);
+    COFF_ObjSection *undef_sect = t_push_data_section(obj_writer, str8_array_fixed(undef_obj_payload));
+    COFF_ObjSymbol *undef_symbol = coff_obj_writer_push_symbol_undef(obj_writer, shared_symbol_name);
+    coff_obj_writer_section_push_reloc(obj_writer, undef_sect, 0, undef_symbol, COFF_Reloc_X64_Addr32Nb);
+    String8 undef_obj = coff_obj_writer_serialize(scratch.arena, obj_writer);
+    coff_obj_writer_release(&obj_writer);
+    if (!t_write_file(undef_obj_name, undef_obj)) {
+      goto exit;
+    }
+  }
+
+  U8 entry_payload[] = {0xC3};
+  String8 entry_obj_name = str8_lit("entry.obj");
+  {
+    COFF_ObjWriter *obj_writer = coff_obj_writer_alloc(0, COFF_MachineType_X64);
+    COFF_ObjSection *text_sect = t_push_text_section(obj_writer, str8_array_fixed(entry_payload));
+    coff_obj_writer_push_symbol_extern(obj_writer, entry_symbol_name, 0, text_sect);
+    String8 entry_obj = coff_obj_writer_serialize(scratch.arena, obj_writer);
+    coff_obj_writer_release(&obj_writer);
+    if (!t_write_file(entry_obj_name, entry_obj)) {
+      goto exit;
+    }
+  }
+
+  int linker_exit_code = t_invoke_linkerf("/subsystem:console /entry:%S /out:a.exe %S %S %S %S", entry_symbol_name, weak_obj_name, entry_obj_name, ptr_obj_name, undef_obj_name);
+
+  T_Linker link_ident = t_ident_linker();
+  if (link_ident == T_Linker_MSVC && linker_exit_code != T_MsvcLinkExitCode_CorruptOrInvalidSymbolTable) {
+    goto exit;
+  }
+
+
+exit:;
+  scratch_end(scratch);
+  return result;
+}
+
 internal String8
 t_make_sec_defn_obj(Arena *arena, String8 payload)
 {
@@ -612,6 +744,66 @@ t_find_merged_pdata(void)
   return result;
 }
 
+internal T_Result
+t_weak_cycle(void)
+{
+  Temp scratch = scratch_begin(0,0);
+
+  T_Result result = T_Result_Fail;
+
+  String8 ab_obj_name = str8_lit("ab.obj");
+  {
+    COFF_ObjWriter *obj_writer = coff_obj_writer_alloc(0, COFF_MachineType_X64);
+    COFF_ObjSymbol *b = coff_obj_writer_push_symbol_undef(obj_writer, str8_lit("B"));
+    coff_obj_writer_push_symbol_weak(obj_writer, str8_lit("A"), COFF_WeakExt_SearchAlias, b);
+    String8 ab_obj = coff_obj_writer_serialize(scratch.arena, obj_writer);
+    coff_obj_writer_release(&obj_writer);
+    if (!t_write_file(ab_obj_name, ab_obj)) {
+      goto exit;
+    }
+  }
+
+  String8 ba_obj_name = str8_lit("ba.obj");
+  {
+    COFF_ObjWriter *obj_writer = coff_obj_writer_alloc(0, COFF_MachineType_X64);
+    COFF_ObjSymbol *a = coff_obj_writer_push_symbol_undef(obj_writer, str8_lit("A"));
+    coff_obj_writer_push_symbol_weak(obj_writer, str8_lit("B"), COFF_WeakExt_SearchAlias, a);
+    String8 ba_obj = coff_obj_writer_serialize(scratch.arena, obj_writer);
+    coff_obj_writer_release(&obj_writer);
+    if (!t_write_file(ba_obj_name, ba_obj)) {
+      goto exit;
+    }
+  }
+
+  String8 entry_obj_name = str8_lit("entry.obj");
+  U8 entry_payload[] = { 0xC3 };
+  {
+    COFF_ObjWriter *obj_writer = coff_obj_writer_alloc(0, COFF_MachineType_X64);
+    COFF_ObjSection *text_sect = t_push_text_section(obj_writer, str8_array_fixed(entry_payload));
+    coff_obj_writer_push_symbol_extern(obj_writer, str8_lit("my_entry"), 0, text_sect);
+    String8 entry_obj = coff_obj_writer_serialize(scratch.arena, obj_writer);
+    coff_obj_writer_release(&obj_writer);
+    if (!t_write_file(entry_obj_name, entry_obj)) {
+      goto exit;
+    }
+  }
+
+  int linker_exit_code = t_invoke_linker_with_time_outf(3 * 1000 * 1000, "/subsystem:console /entry:my_entry %S %S %S", entry_obj_name, ab_obj_name, ba_obj_name);
+  if (linker_exit_code != T_LINKER_TIME_OUT_EXIT_CODE) {
+    if (t_ident_linker() == T_Linker_MSVC) {
+      if (linker_exit_code == 1120) {
+        result = T_Result_Pass;
+      }
+    } else {
+      result = T_Result_Pass;
+    }
+  }
+
+exit:;
+  scratch_end(scratch);
+  return result;
+}
+
 internal T_Result
 t_base_relocs(void)
 {
@@ -690,6 +882,8 @@ entry_point(CmdLine *cmdline)
     { "abs_vs_weak",        t_abs_vs_weak       },
     { "abs_vs_regular",     t_abs_vs_regular    },
     { "abs_vs_common",      t_abs_vs_common     },
+    { "undef_weak",         t_undef_weak        },
+    { "weak_cycle",         t_weak_cycle        },
     { "find_merged_pdata",  t_find_merged_pdata },
     //{ "base_relocs",        t_base_relocs       },
   };