[llvm] de4d2f8 - Fix cyclic header dependency between Support<->Option due to RISCVISAInfo

[Raphael Isemann via llvm-commits]

Author: Raphael Isemann
Date: 2021-10-18T10:06:11+02:00
New Revision: de4d2f80b75e2a1e4b0ac5c25e20f20839633688

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

LOG: Fix cyclic header dependency between Support<->Option due to RISCVISAInfo

This was introduced in D105168 which added RISCVISAInfo.h.

Added: 
    

Modified: 
    llvm/include/llvm/Support/RISCVISAInfo.h
    llvm/lib/Support/RISCVISAInfo.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/include/llvm/Support/RISCVISAInfo.h b/llvm/include/llvm/Support/RISCVISAInfo.h
index 26044cf0a2949..fe8599e1e04be 100644
--- a/llvm/include/llvm/Support/RISCVISAInfo.h
+++ b/llvm/include/llvm/Support/RISCVISAInfo.h
@@ -12,7 +12,6 @@
 #include "llvm/ADT/Optional.h"
 #include "llvm/ADT/StringMap.h"
 #include "llvm/ADT/StringRef.h"
-#include "llvm/Option/ArgList.h"
 #include "llvm/Support/Error.h"
 
 #include <map>
@@ -20,6 +19,9 @@
 #include <vector>
 
 namespace llvm {
+namespace opt {
+class ArgList;
+}
 struct RISCVExtensionInfo {
   std::string ExtName;
   unsigned MajorVersion;

diff  --git a/llvm/lib/Support/RISCVISAInfo.cpp b/llvm/lib/Support/RISCVISAInfo.cpp
index e0bf9ef90eeb6..795d77defc984 100644
--- a/llvm/lib/Support/RISCVISAInfo.cpp
+++ b/llvm/lib/Support/RISCVISAInfo.cpp
@@ -11,6 +11,7 @@
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/ADT/StringRef.h"
+#include "llvm/Option/ArgList.h"
 #include "llvm/Support/Errc.h"
 #include "llvm/Support/Error.h"
 #include "llvm/Support/raw_ostream.h"