Move yaml::Opt to yaml::IO::OptBase [-fpermissive]

Author: chapuni

llvm/include/llvm/ObjectYAML/ELFYAML.h

@@ -788,11 +788,11 @@ bool shouldAllocateFileSpace(ArrayRef<ProgramHeader> Phdrs,
 ///
 /// Derivered classes should not modify OptClassID to ensue that
 /// dyn_cast<ELFYAML::Opt> can find this interface.
-class Opt : public yaml::Opt {
+class Opt : public yaml::IO::OptBase {
 public:
   Opt() {
+    OptBaseClassID = &ID;
     OptClassID = &ID;
-    ELFOptClassID = &ID;
   }
   ~Opt();
 
@@ -811,13 +811,15 @@ class Opt : public yaml::Opt {
   virtual void postMapping(const ELFYAML::Object &Object,
                            bool IsOutputting) = 0;
 
-  /// Tell IO::Opt to be this and derivered classes.
-  static bool classof(const yaml::Opt *Obj) { return (Obj->OptClassID == &ID); }
+  /// Tell IO::OptBase to be this and derivered classes.
+  static bool classof(const yaml::IO::OptBase *Obj) {
+    return (Obj->OptBaseClassID == &ID);
+  }
 
   /// This will be not needed unless the pointer to ELFYAML::Opt would
   /// be cast further.
-  static bool classof(const Opt *Obj) { return (Obj->ELFOptClassID == &ID); }
-  const char *ELFOptClassID;
+  static bool classof(const Opt *Obj) { return (Obj->OptClassID == &ID); }
+  const char *OptClassID;
 
 private:
   static const char ID;

llvm/include/llvm/Support/YAMLTraits.h

@@ -39,18 +39,6 @@ class VersionTuple;
 
 namespace yaml {
 
-/// The base class of options.
-class Opt {
-public:
-  virtual ~Opt();
-
-  static bool classof(const Opt *Obj) { return (Obj->OptClassID == &ID); }
-  const char *OptClassID = &ID;
-
-private:
-  static const char ID;
-};
-
 enum class NodeKind : uint8_t {
   Scalar,
   Map,
@@ -974,13 +962,28 @@ class IO {
     }
   }
 
+public:
+  /// The base class of options.
+  class OptBase {
+  public:
+    virtual ~OptBase();
+
+    static bool classof(const OptBase *Obj) {
+      return (Obj->OptBaseClassID == &ID);
+    }
+    const char *OptBaseClassID = &ID;
+
+  private:
+    static const char ID;
+  };
+
 private:
   void *Ctxt;
-  Opt DefaultOpt;
+  OptBase DefaultOpt;
 
 public:
   /// This may be overwritten in derivered classes.
-  Opt *Opt = &DefaultOpt;
+  OptBase *Opt = &DefaultOpt;
 };
 
 namespace detail {

llvm/lib/Support/YAMLTraits.cpp

@@ -32,12 +32,12 @@ using namespace llvm;
 using namespace yaml;
 
 //===----------------------------------------------------------------------===//
-//  Opt
+//  IO::OptBase
 //===----------------------------------------------------------------------===//
 
-Opt::~Opt() = default;
+IO::OptBase::~OptBase() = default;
 
-const char Opt::ID = '@';
+const char IO::OptBase::ID = '@';
 
 //===----------------------------------------------------------------------===//
 //  IO