[clang] eca4006 - [NFC] Move OptionUtils from Basic to Driver

[Yaxun Liu via cfe-commits]

Author: Yaxun (Sam) Liu
Date: 2019-12-23T08:11:23-05:00
New Revision: eca40066ebb5759aa44d21833c7a1fd7dd2361af

URL: https://github.com/llvm/llvm-project/commit/eca40066ebb5759aa44d21833c7a1fd7dd2361af
DIFF: https://github.com/llvm/llvm-project/commit/eca40066ebb5759aa44d21833c7a1fd7dd2361af.diff

LOG: [NFC] Move OptionUtils from Basic to Driver

Differential Revision: https://reviews.llvm.org/D71802

Added: 
    clang/include/clang/Driver/OptionUtils.h
    clang/lib/Driver/OptionUtils.cpp

Modified: 
    clang/include/clang/Frontend/Utils.h
    clang/lib/Basic/CMakeLists.txt
    clang/lib/Driver/CMakeLists.txt

Removed: 
    clang/include/clang/Basic/OptionUtils.h
    clang/lib/Basic/OptionUtils.cpp


################################################################################
diff  --git a/clang/include/clang/Basic/OptionUtils.h b/clang/include/clang/Driver/OptionUtils.h
similarity index 94%
rename from clang/include/clang/Basic/OptionUtils.h
rename to clang/include/clang/Driver/OptionUtils.h
index 6254f758c2f0..922f536bf33e 100644
--- a/clang/include/clang/Basic/OptionUtils.h
+++ b/clang/include/clang/Driver/OptionUtils.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_BASIC_OPTIONUTILS_H
-#define LLVM_CLANG_BASIC_OPTIONUTILS_H
+#ifndef LLVM_CLANG_DRIVER_OPTIONUTILS_H
+#define LLVM_CLANG_DRIVER_OPTIONUTILS_H
 
 #include "clang/Basic/Diagnostic.h"
 #include "clang/Basic/LLVM.h"
@@ -55,4 +55,4 @@ inline uint64_t getLastArgUInt64Value(const llvm::opt::ArgList &Args,
 
 } // namespace clang
 
-#endif // LLVM_CLANG_BASIC_OPTIONUTILS_H
+#endif // LLVM_CLANG_DRIVER_OPTIONUTILS_H

diff  --git a/clang/include/clang/Frontend/Utils.h b/clang/include/clang/Frontend/Utils.h
index d5990d56ba28..b5834921b9ed 100644
--- a/clang/include/clang/Frontend/Utils.h
+++ b/clang/include/clang/Frontend/Utils.h
@@ -15,7 +15,7 @@
 
 #include "clang/Basic/Diagnostic.h"
 #include "clang/Basic/LLVM.h"
-#include "clang/Basic/OptionUtils.h"
+#include "clang/Driver/OptionUtils.h"
 #include "clang/Frontend/DependencyOutputOptions.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/IntrusiveRefCntPtr.h"

diff  --git a/clang/lib/Basic/CMakeLists.txt b/clang/lib/Basic/CMakeLists.txt
index b54d261b9d1d..be739c70468e 100644
--- a/clang/lib/Basic/CMakeLists.txt
+++ b/clang/lib/Basic/CMakeLists.txt
@@ -1,7 +1,6 @@
 set(LLVM_LINK_COMPONENTS
   Core
   MC
-  Option
   Support
   )
 
@@ -56,7 +55,6 @@ add_clang_library(clangBasic
   ObjCRuntime.cpp
   OpenMPKinds.cpp
   OperatorPrecedence.cpp
-  OptionUtils.cpp
   SanitizerBlacklist.cpp
   SanitizerSpecialCaseList.cpp
   Sanitizers.cpp

diff  --git a/clang/lib/Driver/CMakeLists.txt b/clang/lib/Driver/CMakeLists.txt
index eb76cd3dcade..6f25d3588ebb 100644
--- a/clang/lib/Driver/CMakeLists.txt
+++ b/clang/lib/Driver/CMakeLists.txt
@@ -19,6 +19,7 @@ add_clang_library(clangDriver
   DriverOptions.cpp
   Job.cpp
   Multilib.cpp
+  OptionUtils.cpp
   Phases.cpp
   SanitizerArgs.cpp
   Tool.cpp

diff  --git a/clang/lib/Basic/OptionUtils.cpp b/clang/lib/Driver/OptionUtils.cpp
similarity index 97%
rename from clang/lib/Basic/OptionUtils.cpp
rename to clang/lib/Driver/OptionUtils.cpp
index e33c233b58b7..1f36ffc03cab 100644
--- a/clang/lib/Basic/OptionUtils.cpp
+++ b/clang/lib/Driver/OptionUtils.cpp
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/Basic/OptionUtils.h"
 #include "clang/Basic/Diagnostic.h"
 #include "clang/Basic/DiagnosticDriver.h"
+#include "clang/Driver/OptionUtils.h"
 #include "llvm/Option/ArgList.h"
 
 using namespace clang;