[PATCH] D68744: [GSYM] Add GsymCreator and GsymReader.

Nico Weber via Phabricator via llvm-commits llvm-commits at lists.llvm.org
Thu Oct 10 11:22:16 PDT 2019


thakis added a comment.

That's still not enough, you need to remove a bunch of (unused) includes. With this, my windows box is happy. (I don't have svn setup on my win box, so I can't land this easily):

  diff --git a/llvm/lib/DebugInfo/GSYM/GsymCreator.cpp b/llvm/lib/DebugInfo/GSYM/GsymCreator.cpp
  index 9dc632dfcfb..f371426f201 100644
  --- a/llvm/lib/DebugInfo/GSYM/GsymCreator.cpp
  +++ b/llvm/lib/DebugInfo/GSYM/GsymCreator.cpp
  @@ -14,7 +14,8 @@
  
   #include <algorithm>
   #include <cassert>
  -#include <strings.h>
  +#include <functional>
  +#include <vector>
  
   using namespace llvm;
   using namespace gsym;
  @@ -73,7 +74,7 @@ llvm::Error GsymCreator::encode(FileWriter &O) const {
     Hdr.NumAddresses = static_cast<uint32_t>(Funcs.size());
     Hdr.StrtabOffset = 0; // We will fix this up later.
     Hdr.StrtabOffset = 0; // We will fix this up later.
  -  bzero(Hdr.UUID, sizeof(Hdr.UUID));
  +  memset(Hdr.UUID, 0, sizeof(Hdr.UUID));
     if (UUID.size() > sizeof(Hdr.UUID))
       return createStringError(std::errc::invalid_argument,
                                "invalid UUID size %u", (uint32_t)UUID.size());
  diff --git a/llvm/lib/DebugInfo/GSYM/GsymReader.cpp b/llvm/lib/DebugInfo/GSYM/GsymReader.cpp
  index f7bbd700713..dfb585b87c1 100644
  --- a/llvm/lib/DebugInfo/GSYM/GsymReader.cpp
  +++ b/llvm/lib/DebugInfo/GSYM/GsymReader.cpp
  @@ -10,17 +10,8 @@
   #include "llvm/DebugInfo/GSYM/GsymReader.h"
  
   #include <assert.h>
  -#include <fcntl.h>
   #include <inttypes.h>
  -#include <stdio.h>
   #include <stdlib.h>
  -#include <sys/stat.h>
  -#include <sys/types.h>
  -#include <unistd.h>
  -
  -#include <fstream>
  -#include <functional>
  -#include <vector>
  
   #include "llvm/DebugInfo/GSYM/GsymCreator.h"
   #include "llvm/DebugInfo/GSYM/InlineInfo.h"


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D68744/new/

https://reviews.llvm.org/D68744





More information about the llvm-commits mailing list