merge conf fix

Author: NikitaSmith057

src/rdi_from_dwarf/rdi_from_dwarf.c

@@ -258,17 +258,6 @@ d2r_collect_proc_params(Arena *arena, D2R_TypeTable *type_table, DW_Input *input
 
 ////////////////////////////////
 
-internal B32
-rdim_is_bytecode_tls_dependent(RDIM_EvalBytecode bc)
-{
-  for EachNode(n, RDIM_EvalBytecodeOp, bc.first_op) {
-    if (n->op == RDI_EvalOp_TLSOff) {
-      return 1;
-    }
-  }
-  return 0;
-}
-
 internal B32
 rdim_is_eval_bytecode_static(RDIM_EvalBytecode bc)
 {

src/rdi_from_dwarf/rdi_from_dwarf.h

@@ -111,7 +111,6 @@ internal RDI_EvalTypeGroup d2r_type_group_from_type_kind(RDI_TypeKind x);
 ////////////////////////////////
 //~ RDIM Bytecode Helpers
 
-internal B32 rdim_is_bytecode_tls_dependent(RDIM_EvalBytecode bc);
 internal B32 rdim_is_eval_bytecode_static(RDIM_EvalBytecode bc);
 internal U64 rdim_virt_off_from_eval_bytecode(RDIM_EvalBytecode bc, U64 image_base);