[llvm] r331184 - IWYU for llvm-config.h in llvm, additions.

Justin Bogner via llvm-commits llvm-commits at lists.llvm.org
Thu May 3 15:03:50 PDT 2018


Nico Weber via llvm-commits <llvm-commits at lists.llvm.org> writes:
> Author: nico
> Date: Mon Apr 30 07:59:11 2018
> New Revision: 331184
>
> URL: http://llvm.org/viewvc/llvm-project?rev=331184&view=rev
> Log:
> IWYU for llvm-config.h in llvm, additions.
>
> See r331124 for how I made a list of files missing the include.
> I then ran this Python script:
>
>     for f in open('filelist.txt'):
>         f = f.strip()
>         fl = open(f).readlines()
>
>         found = False
>         for i in xrange(len(fl)):
>             p = '#include "llvm/'
>             if not fl[i].startswith(p):
>                 continue
>             if fl[i][len(p):] > 'Config':
>                 fl.insert(i, '#include "llvm/Config/llvm-config.h"\n')
>                 found = True
>                 break
>         if not found:
>             print 'not found', f
>         else:
>             open(f, 'w').write(''.join(fl))
>
> and then looked through everything with `svn diff | diffstat -l | xargs -n 1000 gvim -p`
> and tried to fix include ordering and whatnot.
>
> No intended behavior change.
>
> Modified: llvm/trunk/lib/Support/COM.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/COM.cpp?rev=331184&r1=331183&r2=331184&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Support/COM.cpp (original)
> +++ llvm/trunk/lib/Support/COM.cpp Mon Apr 30 07:59:11 2018
> @@ -13,7 +13,7 @@
>  
>  #include "llvm/Support/COM.h"
>  
> -#include "llvm/Config/config.h"
> +#include "llvm/Config/llvm-config.h"
>  
>  // Include the platform-specific parts of this class.
>  #ifdef LLVM_ON_UNIX
>
> Modified: llvm/trunk/lib/Support/Chrono.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Chrono.cpp?rev=331184&r1=331183&r2=331184&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Support/Chrono.cpp (original)
> +++ llvm/trunk/lib/Support/Chrono.cpp Mon Apr 30 07:59:11 2018
> @@ -8,7 +8,7 @@
>  //===----------------------------------------------------------------------===//
>  
>  #include "llvm/Support/Chrono.h"
> -#include "llvm/Config/config.h"
> +#include "llvm/Config/llvm-config.h"
>  #include "llvm/Support/Format.h"
>  #include "llvm/Support/raw_ostream.h"
>  
>
> Modified: llvm/trunk/lib/Support/CodeGenCoverage.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/CodeGenCoverage.cpp?rev=331184&r1=331183&r2=331184&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Support/CodeGenCoverage.cpp (original)
> +++ llvm/trunk/lib/Support/CodeGenCoverage.cpp Mon Apr 30 07:59:11 2018
> @@ -12,7 +12,7 @@
>  
>  #include "llvm/Support/CodeGenCoverage.h"
>  
> -#include "llvm/Config/config.h"
> +#include "llvm/Config/llvm-config.h"
>  #include "llvm/Support/Endian.h"
>  #include "llvm/Support/FileSystem.h"
>  #include "llvm/Support/MemoryBuffer.h"
>
> Modified: llvm/trunk/lib/Support/CrashRecoveryContext.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/CrashRecoveryContext.cpp?rev=331184&r1=331183&r2=331184&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Support/CrashRecoveryContext.cpp (original)
> +++ llvm/trunk/lib/Support/CrashRecoveryContext.cpp Mon Apr 30 07:59:11 2018
> @@ -8,7 +8,7 @@
>  //===----------------------------------------------------------------------===//
>  
>  #include "llvm/Support/CrashRecoveryContext.h"
> -#include "llvm/Config/config.h"
> +#include "llvm/Config/llvm-config.h"
>  #include "llvm/Support/ErrorHandling.h"
>  #include "llvm/Support/ManagedStatic.h"
>  #include "llvm/Support/Mutex.h"
>
> Modified: llvm/trunk/lib/Support/Host.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Host.cpp?rev=331184&r1=331183&r2=331184&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Support/Host.cpp (original)
> +++ llvm/trunk/lib/Support/Host.cpp Mon Apr 30 07:59:11 2018
> @@ -18,7 +18,7 @@
>  #include "llvm/ADT/StringRef.h"
>  #include "llvm/ADT/StringSwitch.h"
>  #include "llvm/ADT/Triple.h"
> -#include "llvm/Config/config.h"
> +#include "llvm/Config/llvm-config.h"
>  #include "llvm/Support/Debug.h"
>  #include "llvm/Support/FileSystem.h"
>  #include "llvm/Support/MemoryBuffer.h"
>
> Modified: llvm/trunk/lib/Support/Memory.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Memory.cpp?rev=331184&r1=331183&r2=331184&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Support/Memory.cpp (original)
> +++ llvm/trunk/lib/Support/Memory.cpp Mon Apr 30 07:59:11 2018
> @@ -13,7 +13,7 @@
>  //===----------------------------------------------------------------------===//
>  
>  #include "llvm/Support/Memory.h"
> -#include "llvm/Config/config.h"
> +#include "llvm/Config/llvm-config.h"
>  #include "llvm/Support/Valgrind.h"
>  
>  // Include the platform-specific parts of this class.
>
> Modified: llvm/trunk/lib/Support/Process.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Process.cpp?rev=331184&r1=331183&r2=331184&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Support/Process.cpp (original)
> +++ llvm/trunk/lib/Support/Process.cpp Mon Apr 30 07:59:11 2018
> @@ -14,7 +14,7 @@
>  #include "llvm/Support/Process.h"
>  #include "llvm/ADT/STLExtras.h"
>  #include "llvm/ADT/StringExtras.h"
> -#include "llvm/Config/config.h"
> +#include "llvm/Config/llvm-config.h"
>  #include "llvm/Support/FileSystem.h"
>  #include "llvm/Support/Path.h"
>  #include "llvm/Support/Program.h"
>
> Modified: llvm/trunk/lib/Support/Program.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Program.cpp?rev=331184&r1=331183&r2=331184&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Support/Program.cpp (original)
> +++ llvm/trunk/lib/Support/Program.cpp Mon Apr 30 07:59:11 2018
> @@ -13,7 +13,7 @@
>  
>  #include "llvm/Support/Program.h"
>  #include "llvm/ADT/StringRef.h"
> -#include "llvm/Config/config.h"
> +#include "llvm/Config/llvm-config.h"
>  #include <system_error>
>  using namespace llvm;
>  using namespace sys;
>
> Modified: llvm/trunk/lib/Support/RWMutex.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/RWMutex.cpp?rev=331184&r1=331183&r2=331184&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Support/RWMutex.cpp (original)
> +++ llvm/trunk/lib/Support/RWMutex.cpp Mon Apr 30 07:59:11 2018
> @@ -13,7 +13,7 @@
>  
>  #include "llvm/Support/Allocator.h"
>  #include "llvm/Support/RWMutex.h"
> -#include "llvm/Config/config.h"
> +#include "llvm/Config/llvm-config.h"

Unfortunately, this part is not NFC.

RWMutex.cpp uses HAVE_PTHREAD_H and HAVE_PTHREAD_RWLOCK_INIT, so it
needs config.h to behave correctly. I've fixed this in r331487 and a
cursory glance at the other places you changed config.h to llvm-config.h
look like they're fine, but you may want to double check.

>  
>  //===----------------------------------------------------------------------===//
>  //=== WARNING: Implementation here must contain only TRULY operating system
>
> Modified: llvm/trunk/lib/Support/Signals.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Signals.cpp?rev=331184&r1=331183&r2=331184&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Support/Signals.cpp (original)
> +++ llvm/trunk/lib/Support/Signals.cpp Mon Apr 30 07:59:11 2018
> @@ -15,7 +15,7 @@
>  #include "llvm/Support/Signals.h"
>  #include "llvm/ADT/STLExtras.h"
>  #include "llvm/ADT/StringRef.h"
> -#include "llvm/Config/config.h"
> +#include "llvm/Config/llvm-config.h"
>  #include "llvm/Support/ErrorOr.h"
>  #include "llvm/Support/FileSystem.h"
>  #include "llvm/Support/FileUtilities.h"
>
> Modified: llvm/trunk/lib/Support/ThreadLocal.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/ThreadLocal.cpp?rev=331184&r1=331183&r2=331184&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Support/ThreadLocal.cpp (original)
> +++ llvm/trunk/lib/Support/ThreadLocal.cpp Mon Apr 30 07:59:11 2018
> @@ -12,7 +12,7 @@
>  //===----------------------------------------------------------------------===//
>  
>  #include "llvm/Support/ThreadLocal.h"
> -#include "llvm/Config/config.h"
> +#include "llvm/Config/llvm-config.h"
>  #include "llvm/Support/Compiler.h"
>  
>  //===----------------------------------------------------------------------===//
>
> Modified: llvm/trunk/lib/Support/Unix/Memory.inc
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Unix/Memory.inc?rev=331184&r1=331183&r2=331184&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Support/Unix/Memory.inc (original)
> +++ llvm/trunk/lib/Support/Unix/Memory.inc Mon Apr 30 07:59:11 2018
> @@ -12,6 +12,7 @@
>  //===----------------------------------------------------------------------===//
>  
>  #include "Unix.h"
> +#include "llvm/Config/config.h"
>  #include "llvm/Support/DataTypes.h"
>  #include "llvm/Support/ErrorHandling.h"
>  #include "llvm/Support/Process.h"
>
> Modified: llvm/trunk/lib/Support/Unix/Process.inc
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Unix/Process.inc?rev=331184&r1=331183&r2=331184&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Support/Unix/Process.inc (original)
> +++ llvm/trunk/lib/Support/Unix/Process.inc Mon Apr 30 07:59:11 2018
> @@ -14,6 +14,7 @@
>  #include "Unix.h"
>  #include "llvm/ADT/Hashing.h"
>  #include "llvm/ADT/StringRef.h"
> +#include "llvm/Config/config.h"
>  #include "llvm/Support/ManagedStatic.h"
>  #include "llvm/Support/Mutex.h"
>  #include "llvm/Support/MutexGuard.h"
>
> Modified: llvm/trunk/lib/Support/Unix/Signals.inc
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Unix/Signals.inc?rev=331184&r1=331183&r2=331184&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Support/Unix/Signals.inc (original)
> +++ llvm/trunk/lib/Support/Unix/Signals.inc Mon Apr 30 07:59:11 2018
> @@ -14,6 +14,7 @@
>  
>  #include "Unix.h"
>  #include "llvm/ADT/STLExtras.h"
> +#include "llvm/Config/config.h"
>  #include "llvm/Demangle/Demangle.h"
>  #include "llvm/Support/FileSystem.h"
>  #include "llvm/Support/FileUtilities.h"
>
> Modified: llvm/trunk/lib/Support/Unix/ThreadLocal.inc
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Unix/ThreadLocal.inc?rev=331184&r1=331183&r2=331184&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Support/Unix/ThreadLocal.inc (original)
> +++ llvm/trunk/lib/Support/Unix/ThreadLocal.inc Mon Apr 30 07:59:11 2018
> @@ -16,6 +16,8 @@
>  //===          is guaranteed to work on *all* UNIX variants.
>  //===----------------------------------------------------------------------===//
>  
> +#include "llvm/Config/config.h"
> +
>  #if defined(HAVE_PTHREAD_H) && defined(HAVE_PTHREAD_GETSPECIFIC)
>  
>  #include <cassert>
>
> Modified: llvm/trunk/lib/Support/Unix/Watchdog.inc
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Unix/Watchdog.inc?rev=331184&r1=331183&r2=331184&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Support/Unix/Watchdog.inc (original)
> +++ llvm/trunk/lib/Support/Unix/Watchdog.inc Mon Apr 30 07:59:11 2018
> @@ -11,6 +11,8 @@
>  //
>  //===----------------------------------------------------------------------===//
>  
> +#include "llvm/Config/config.h"
> +
>  #ifdef HAVE_UNISTD_H
>  #include <unistd.h>
>  #endif
>
> Modified: llvm/trunk/lib/Support/Watchdog.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Watchdog.cpp?rev=331184&r1=331183&r2=331184&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Support/Watchdog.cpp (original)
> +++ llvm/trunk/lib/Support/Watchdog.cpp Mon Apr 30 07:59:11 2018
> @@ -12,7 +12,7 @@
>  //===----------------------------------------------------------------------===//
>  
>  #include "llvm/Support/Watchdog.h"
> -#include "llvm/Config/config.h"
> +#include "llvm/Config/llvm-config.h"
>  
>  // Include the platform-specific parts of this class.
>  #ifdef LLVM_ON_UNIX


More information about the llvm-commits mailing list