Support getting process maps for sanitizers needs on FreeBSD in 32-bit mode

[samsonov]

lib/sanitizer_common/sanitizer_freebsd.h

103 ↗

(On Diff #12230)

why not write

#define kinfo_vmentry xkinfo_vmentry

here?

[kutuzov.viktor.84]

It would affect definitions in successively included system headers.

[samsonov]

Okay. LGTM

[kutuzov.viktor.84]

Closed by commit rL215185 (authored by vkutuzov).

compiler-rt/trunk/lib/sanitizer_common/sanitizer_freebsd.h

 #include "sanitizer_internal_defs.h"
 
 // x86-64 FreeBSD 9.2 and older define 'ucontext_t' incorrectly in
 // 32-bit mode.
 #if SANITIZER_FREEBSD && (SANITIZER_WORDSIZE == 32)
 # include <osreldate.h>
 # if __FreeBSD_version <= 902001  // v9.2
 #  include <link.h>
+#  include <sys/param.h>
 #  include <ucontext.h>
 
 namespace __sanitizer {
 
+typedef unsigned long long __xuint64_t;
+
 typedef __int32_t __xregister_t;
 
 typedef struct __xmcontext {
   __xregister_t mc_onstack;
   __xregister_t mc_gs;
   __xregister_t mc_fs;
   __xregister_t mc_es;
   __xregister_t mc_ds;
typedef struct __xucontext {
   xmcontext_t  uc_mcontext;
 
   struct __ucontext *uc_link;
   stack_t uc_stack;
   int uc_flags;
   int __spare__[4];
 } xucontext_t;
 
+struct xkinfo_vmentry {
+  int kve_structsize;
+  int kve_type;
+  __xuint64_t kve_start;
+  __xuint64_t kve_end;
+  __xuint64_t kve_offset;
+  __xuint64_t kve_vn_fileid;
+  __uint32_t kve_vn_fsid;
+  int kve_flags;
+  int kve_resident;
+  int kve_private_resident;
+  int kve_protection;
+  int kve_ref_count;
+  int kve_shadow_count;
+  int kve_vn_type;
+  __xuint64_t kve_vn_size;
+  __uint32_t kve_vn_rdev;
+  __uint16_t kve_vn_mode;
+  __uint16_t kve_status;
+  int _kve_ispare[12];
+  char kve_path[PATH_MAX];
+};
+
 typedef struct {
   __uint32_t p_type;
   __uint32_t p_offset;
   __uint32_t p_vaddr;
   __uint32_t p_paddr;
   __uint32_t p_filesz;
   __uint32_t p_memsz;
   __uint32_t p_flags;

compiler-rt/trunk/lib/sanitizer_common/sanitizer_procmaps_freebsd.cc

 #include "sanitizer_common.h"
 #include "sanitizer_freebsd.h"
 #include "sanitizer_procmaps.h"
 
 #include <unistd.h>
 #include <sys/sysctl.h>
 #include <sys/user.h>
 
+// Fix 'kinfo_vmentry' definition on FreeBSD prior v9.2 in 32-bit mode.
+#if SANITIZER_FREEBSD && (SANITIZER_WORDSIZE == 32)
+# include <osreldate.h>
+# if __FreeBSD_version <= 902001  // v9.2
+#  define kinfo_vmentry xkinfo_vmentry
+# endif
+#endif
+
 namespace __sanitizer {
 
 void ReadProcMaps(ProcSelfMapsBuff *proc_maps) {
   const int Mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_VMMAP, getpid() };
   size_t Size = 0;
   int Err = sysctl(Mib, 4, NULL, &Size, NULL, 0);
   CHECK_EQ(Err, 0);
   CHECK_GT(Size, 0);