Merge branch 'dev' of https://github.com/EpicGames/raddebugger into dev

Author: ryanfleury

build.bat

@@ -107,6 +107,7 @@ if "%rdi_breakpad_from_pdb%"=="1"      set didbuild=1 && %compile% ..\src\rdi_br
 if "%radlink%"=="1"                    set didbuild=1 && %compile%  ..\src\linker\lnk.c                                      %compile_link% %out%radlink.exe || exit /b 1
 if "%tester%"=="1"                     set didbuild=1 && %compile% ..\src\tester\tester_main.c                               %compile_link% %out%tester.exe || exit /b 1
 if "%ryan_scratch%"=="1"               set didbuild=1 && %compile% ..\src\scratch\ryan_scratch.c                             %compile_link% %out%ryan_scratch.exe || exit /b 1
+if "%parse_inline_sites%"=="1"         set didbuild=1 && %compile% ..\src\scratch\parse_inline_sites.c                       %compile_link% %out%parse_inline_sites.exe || exit /b 1
 if "%mule_main%"=="1"                  set didbuild=1 && del vc*.pdb mule*.pdb && %compile_release% %only_compile% ..\src\mule\mule_inline.cpp && %compile_release% %only_compile% ..\src\mule\mule_o2.cpp && %compile_debug% %EHsc% ..\src\mule\mule_main.cpp ..\src\mule\mule_c.c mule_inline.obj mule_o2.obj %compile_link% %no_aslr% %out%mule_main.exe || exit /b 1
 if "%mule_module%"=="1"                set didbuild=1 && %compile% ..\src\mule\mule_module.cpp                               %compile_link% %link_dll% %out%mule_module.dll || exit /b 1
 if "%mule_hotload%"=="1"               set didbuild=1 && %compile% ..\src\mule\mule_hotload_main.c %compile_link% %out%mule_hotload.exe & %compile% ..\src\mule\mule_hotload_module_main.c %compile_link% %link_dll% %out%mule_hotload_module.dll || exit /b 1

src/codeview/codeview.c

@@ -193,7 +193,7 @@ cv_decode_inline_annot_u32(String8 data, U64 offset, U32 *out_value)
     }
 
     // 2 bytes
-    else if((header & 0xC0) == 0x80 && cursor+2 <= data.size)
+    else if((header & 0xC0) == 0x80 && cursor+1 <= data.size)
     {
       U8 second_byte;
       cursor += str8_deserial_read_struct(data, cursor, &second_byte);

src/codeview/codeview_stringize.c

@@ -2328,3 +2328,15 @@ cv_stringize_c13_parsed(Arena *arena, String8List *out, CV_C13Parsed *c13){
     str8_list_push(arena, out, str8_lit("\n"));
   }
 }
+
+internal String8
+cv_string_from_inline_range_kind(CV_InlineRangeKind kind)
+{
+  String8 result = str8_zero();
+  switch (kind) {
+  case CV_InlineRangeKind_Expr: result = str8_lit("Expr"); break;
+  case CV_InlineRangeKind_Stmt: result = str8_lit("Stmt"); break;
+  }
+  return result;
+}
+

src/codeview/codeview_stringize.h

@@ -79,4 +79,6 @@ internal void cv_stringize_leaf_array(Arena *arena, String8List *out,
 
 internal void cv_stringize_c13_parsed(Arena *arena, String8List *out, CV_C13Parsed *c13);
 
+internal String8 cv_string_from_inline_range_kind(CV_InlineRangeKind kind);
+
 #endif // CODEVIEW_STRINGIZE_H

src/linker/lnk_debug_info.c

@@ -4397,6 +4397,25 @@ THREAD_POOL_TASK_FUNC(lnk_convert_line_tables_to_rdi_task)
   ProfEnd();
 }
 
+internal
+THREAD_POOL_TASK_FUNC(lnk_build_inlinee_lines_accels_task)
+{
+  ProfBeginFunction();
+  Temp scratch = scratch_begin(&arena, 1);
+
+  LNK_ConvertUnitToRDITask *task    = raw_task;
+  CV_DebugS                 debug_s = task->debug_s_arr[task_id];
+
+  String8List                   raw_inlinee_lines   = cv_sub_section_from_debug_s(debug_s, CV_C13SubSectionKind_InlineeLines);
+  CV_C13InlineeLinesParsedList  inlinee_lines       = cv_c13_inlinee_lines_from_sub_sections(arena, raw_inlinee_lines);
+  CV_InlineeLinesAccel         *inlinee_lines_accel = cv_c13_make_inlinee_lines_accel(arena, inlinee_lines);
+
+  task->inlinee_lines_accel_arr[task_id] = inlinee_lines_accel;
+
+  scratch_end(scratch);
+  ProfEnd();
+}
+
 internal
 THREAD_POOL_TASK_FUNC(lnk_convert_symbols_to_rdi_task)
 {
@@ -4917,7 +4936,7 @@ THREAD_POOL_TASK_FUNC(lnk_convert_symbols_to_rdi_task)
     } break;
     case CV_SymKind_INLINESITE: {
       CV_SymInlineSite *sym_inline_site = (CV_SymInlineSite *) symbol.data.str;
-      String8           binary_annots   = str8((U8 *) (sym_inline_site + 1), symbol.data.size - sizeof(*sym_inline_site));
+      String8           binary_annots   = str8_skip(symbol.data, sizeof(*sym_inline_site));
 
       U64 parent_voff = 0;
       if (scope_stack != 0) {
@@ -4972,7 +4991,7 @@ THREAD_POOL_TASK_FUNC(lnk_convert_symbols_to_rdi_task)
 
       inline_site->convert_ref.ud0 = binary_annots_parsed.lines;
       inline_site->convert_ref.ud1 = binary_annots_parsed.lines_count;
-      inline_site->convert_ref.ud2 = task_id;
+      inline_site->convert_ref.ud2 = symbols_input.obj_idx;
 
       // fill out scope
       RDIB_Scope *scope = rdib_scope_chunk_list_push(arena, &task->scopes[worker_id], task->symbol_chunk_cap);
@@ -5208,6 +5227,7 @@ lnk_build_rad_debug_info(TP_Context               *tp,
     udt_name_buckets     = lnk_udt_name_hash_table_from_debug_t(tp, tp_arena, types[CV_TypeIndexSource_TPI], &udt_name_buckets_cap);
     ProfEnd();
 
+
     ProfBegin("Convert CodeView types to RDIB Types");
     LNK_ConvertTypesToRDI task         = {0};
     task.types                         = types;
@@ -5349,6 +5369,11 @@ lnk_build_rad_debug_info(TP_Context               *tp,
     tp_for_parallel(tp, tp_arena, obj_count, lnk_convert_line_tables_to_rdi_task, &task);
     ProfEnd();
 
+    ProfBegin("Build Inlinee Lines Accels");
+    task.inlinee_lines_accel_arr = push_array(scratch.arena, CV_InlineeLinesAccel *, obj_count);
+    tp_for_parallel(tp, tp_arena, obj_count, lnk_build_inlinee_lines_accels_task, &task);
+    ProfEnd();
+
     ProfBegin("Convert Symbols");
     tp_for_parallel(tp, tp_arena, total_symbol_input_count, lnk_convert_symbols_to_rdi_task, &task);
     ProfEnd();