From 6d55d21643c41284646c2a3430f71ebed3ad3a7c Mon Sep 17 00:00:00 2001 From: Ryan Fleury Date: Fri, 1 Nov 2024 15:22:26 -0700 Subject: [PATCH] fix clang builds --- src/base/base_strings.c | 7 +- src/eval/eval_parse.c | 2 +- .../eval_visualization_core.c | 2 +- src/lib_rdi_format/rdi_format_parse.c | 2 - src/ptr_graph_cache/ptr_graph_cache.c | 3 +- src/rdi_from_pdb/rdi_from_pdb.h | 70 ++++++++----------- 6 files changed, 39 insertions(+), 47 deletions(-) diff --git a/src/base/base_strings.c b/src/base/base_strings.c index 2038fef0..72616c76 100644 --- a/src/base/base_strings.c +++ b/src/base/base_strings.c @@ -1160,7 +1160,9 @@ str8_path_list_resolve_dots_in_place(String8List *path, PathStyle style){ internal String8 str8_path_list_join_by_style(Arena *arena, String8List *path, PathStyle style){ StringJoin params = {0}; - switch (style){ + switch(style) + { + case PathStyle_Null:{}break; case PathStyle_Relative: case PathStyle_WindowsAbsolute: { @@ -1173,9 +1175,8 @@ str8_path_list_join_by_style(Arena *arena, String8List *path, PathStyle style){ params.sep = str8_lit("/"); }break; } - String8 result = str8_list_join(arena, path, ¶ms); - return(result); + return result; } internal String8TxtPtPair diff --git a/src/eval/eval_parse.c b/src/eval/eval_parse.c index 36b11a75..cf8e4715 100644 --- a/src/eval/eval_parse.c +++ b/src/eval/eval_parse.c @@ -487,7 +487,7 @@ e_token_array_from_text(Arena *arena, String8 text) }break; case E_TokenKind_Numeric: { - if(exp && byte == '+' || byte == '-'){} + if(exp && (byte == '+' || byte == '-')){} else if(!char_is_alpha(byte) && !char_is_digit(byte, 10) && byte != '.' && byte != ':') { advance = 0; diff --git a/src/eval_visualization/eval_visualization_core.c b/src/eval_visualization/eval_visualization_core.c index fb40ec69..b8974c71 100644 --- a/src/eval_visualization/eval_visualization_core.c +++ b/src/eval_visualization/eval_visualization_core.c @@ -819,7 +819,7 @@ ev_block_tree_from_expr(Arena *arena, EV_View *view, String8 filter, String8 str } // rjf: gather children expansions from inverse of expansion state - if(!child_count && (expand_info.rows_default_expanded || expand_node == 0 && !expand_info.rows_default_expanded)) + if(!child_count && (expand_info.rows_default_expanded || (expand_node == 0 && !expand_info.rows_default_expanded))) { child_count = expand_info.row_count; child_keys = push_array(scratch.arena, EV_Key, child_count); diff --git a/src/lib_rdi_format/rdi_format_parse.c b/src/lib_rdi_format/rdi_format_parse.c index f2a00bc0..b396f76a 100644 --- a/src/lib_rdi_format/rdi_format_parse.c +++ b/src/lib_rdi_format/rdi_format_parse.c @@ -484,7 +484,6 @@ rdi_parsed_from_name_map(RDI_Parsed *rdi, RDI_NameMap *mapptr, RDI_ParsedNameMap RDI_PROC RDI_NameMapNode* rdi_name_map_lookup(RDI_Parsed *p, RDI_ParsedNameMap *map, RDI_U8 *str, RDI_U64 len) { - ProfBeginFunction(); RDI_NameMapNode *result = 0; if(map->bucket_count > 0) { @@ -521,7 +520,6 @@ rdi_name_map_lookup(RDI_Parsed *p, RDI_ParsedNameMap *map, RDI_U8 *str, RDI_U64 } } - ProfEnd(); return result; } diff --git a/src/ptr_graph_cache/ptr_graph_cache.c b/src/ptr_graph_cache/ptr_graph_cache.c index 0e811d47..9ca8d09d 100644 --- a/src/ptr_graph_cache/ptr_graph_cache.c +++ b/src/ptr_graph_cache/ptr_graph_cache.c @@ -111,7 +111,8 @@ ptg_scope_touch_node__stripe_r_guarded(PTG_Scope *scope, PTG_GraphNode *node) internal PTG_Graph * ptg_graph_from_key(PTG_Scope *scope, PTG_Key *key) { - + PTG_Graph *g = 0; + return g; } //////////////////////////////// diff --git a/src/rdi_from_pdb/rdi_from_pdb.h b/src/rdi_from_pdb/rdi_from_pdb.h index 22a80468..3331f0eb 100644 --- a/src/rdi_from_pdb/rdi_from_pdb.h +++ b/src/rdi_from_pdb/rdi_from_pdb.h @@ -583,39 +583,31 @@ ASYNC_WORK_DEF(p2r_c13_stream_parse_work); ASYNC_WORK_DEF(p2r_comp_unit_parse_work); ASYNC_WORK_DEF(p2r_comp_unit_contributions_parse_work); -internal TS_TASK_FUNCTION_DEF(p2r_exe_hash_task__entry_point); -internal TS_TASK_FUNCTION_DEF(p2r_tpi_hash_parse_task__entry_point); -internal TS_TASK_FUNCTION_DEF(p2r_tpi_leaf_parse_task__entry_point); -internal TS_TASK_FUNCTION_DEF(p2r_symbol_stream_parse_task__entry_point); -internal TS_TASK_FUNCTION_DEF(p2r_c13_stream_parse_task__entry_point); -internal TS_TASK_FUNCTION_DEF(p2r_comp_unit_parse_task__entry_point); -internal TS_TASK_FUNCTION_DEF(p2r_comp_unit_contributions_parse_task__entry_point); - //////////////////////////////// //~ rjf: Unit Conversion Tasks -internal TS_TASK_FUNCTION_DEF(p2r_units_convert_task__entry_point); +ASYNC_WORK_DEF(p2r_units_convert_work); //////////////////////////////// //~ rjf: Link Name Map Building Tasks -internal TS_TASK_FUNCTION_DEF(p2r_link_name_map_build_task__entry_point); +ASYNC_WORK_DEF(p2r_link_name_map_build_work); //////////////////////////////// //~ rjf: Type Parsing/Conversion Tasks -internal TS_TASK_FUNCTION_DEF(p2r_itype_fwd_map_fill_task__entry_point); -internal TS_TASK_FUNCTION_DEF(p2r_itype_chain_build_task__entry_point); +ASYNC_WORK_DEF(p2r_itype_fwd_map_fill_work); +ASYNC_WORK_DEF(p2r_itype_chain_build_work); //////////////////////////////// //~ rjf: UDT Conversion Tasks -internal TS_TASK_FUNCTION_DEF(p2r_udt_convert_task__entry_point); +ASYNC_WORK_DEF(p2r_udt_convert_work); //////////////////////////////// //~ rjf: Symbol Stream Conversion Tasks -internal TS_TASK_FUNCTION_DEF(p2r_symbol_stream_convert_task__entry_point); +ASYNC_WORK_DEF(p2r_symbol_stream_convert_work); //////////////////////////////// //~ rjf: Top-Level Conversion Entry Point @@ -626,41 +618,41 @@ internal P2R_Convert2Bake *p2r_convert(Arena *arena, P2R_User2Convert *in); //~ rjf: Baking Stage Tasks //- rjf: unsorted bake string map building -internal TS_TASK_FUNCTION_DEF(p2r_bake_src_files_strings_task__entry_point); -internal TS_TASK_FUNCTION_DEF(p2r_bake_units_strings_task__entry_point); -internal TS_TASK_FUNCTION_DEF(p2r_bake_types_strings_task__entry_point); -internal TS_TASK_FUNCTION_DEF(p2r_bake_udts_strings_task__entry_point); -internal TS_TASK_FUNCTION_DEF(p2r_bake_symbols_strings_task__entry_point); -internal TS_TASK_FUNCTION_DEF(p2r_bake_scopes_strings_task__entry_point); -internal TS_TASK_FUNCTION_DEF(p2r_bake_line_tables_task__entry_point); +ASYNC_WORK_DEF(p2r_bake_src_files_strings_work); +ASYNC_WORK_DEF(p2r_bake_units_strings_work); +ASYNC_WORK_DEF(p2r_bake_types_strings_work); +ASYNC_WORK_DEF(p2r_bake_udts_strings_work); +ASYNC_WORK_DEF(p2r_bake_symbols_strings_work); +ASYNC_WORK_DEF(p2r_bake_scopes_strings_work); +ASYNC_WORK_DEF(p2r_bake_line_tables_work); //- rjf: bake string map joining -internal TS_TASK_FUNCTION_DEF(p2r_bake_string_map_join_task__entry_point); +ASYNC_WORK_DEF(p2r_bake_string_map_join_work); //- rjf: bake string map sorting -internal TS_TASK_FUNCTION_DEF(p2r_bake_string_map_sort_task__entry_point); +ASYNC_WORK_DEF(p2r_bake_string_map_sort_work); //- rjf: pass 1: interner/deduper map builds -internal TS_TASK_FUNCTION_DEF(p2r_build_bake_name_map_task__entry_point); +ASYNC_WORK_DEF(p2r_build_bake_name_map_work); //- rjf: pass 2: string-map-dependent debug info stream builds -internal TS_TASK_FUNCTION_DEF(p2r_bake_units_task__entry_point); -internal TS_TASK_FUNCTION_DEF(p2r_bake_unit_vmap_task__entry_point); -internal TS_TASK_FUNCTION_DEF(p2r_bake_src_files_task__entry_point); -internal TS_TASK_FUNCTION_DEF(p2r_bake_udts_task__entry_point); -internal TS_TASK_FUNCTION_DEF(p2r_bake_global_variables_task__entry_point); -internal TS_TASK_FUNCTION_DEF(p2r_bake_global_vmap_task__entry_point); -internal TS_TASK_FUNCTION_DEF(p2r_bake_thread_variables_task__entry_point); -internal TS_TASK_FUNCTION_DEF(p2r_bake_procedures_task__entry_point); -internal TS_TASK_FUNCTION_DEF(p2r_bake_scopes_task__entry_point); -internal TS_TASK_FUNCTION_DEF(p2r_bake_scope_vmap_task__entry_point); -internal TS_TASK_FUNCTION_DEF(p2r_bake_file_paths_task__entry_point); -internal TS_TASK_FUNCTION_DEF(p2r_bake_strings_task__entry_point); +ASYNC_WORK_DEF(p2r_bake_units_work); +ASYNC_WORK_DEF(p2r_bake_unit_vmap_work); +ASYNC_WORK_DEF(p2r_bake_src_files_work); +ASYNC_WORK_DEF(p2r_bake_udts_work); +ASYNC_WORK_DEF(p2r_bake_global_variables_work); +ASYNC_WORK_DEF(p2r_bake_global_vmap_work); +ASYNC_WORK_DEF(p2r_bake_thread_variables_work); +ASYNC_WORK_DEF(p2r_bake_procedures_work); +ASYNC_WORK_DEF(p2r_bake_scopes_work); +ASYNC_WORK_DEF(p2r_bake_scope_vmap_work); +ASYNC_WORK_DEF(p2r_bake_file_paths_work); +ASYNC_WORK_DEF(p2r_bake_strings_work); //- rjf: pass 3: idx-run-map-dependent debug info stream builds -internal TS_TASK_FUNCTION_DEF(p2r_bake_type_nodes_task__entry_point); -internal TS_TASK_FUNCTION_DEF(p2r_bake_name_map_task__entry_point); -internal TS_TASK_FUNCTION_DEF(p2r_bake_idx_runs_task__entry_point); +ASYNC_WORK_DEF(p2r_bake_type_nodes_work); +ASYNC_WORK_DEF(p2r_bake_name_map_work); +ASYNC_WORK_DEF(p2r_bake_idx_runs_work); //////////////////////////////// //~ rjf: Top-Level Initialization