[TableGen] Remove convertValue functions for UnOpInit, BinOpInit, and TernOpInit...

I don't think converting the inputs to the Ops was the right behavior anyway.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@238543 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/TableGen/Record.h b/include/llvm/TableGen/Record.h
index 75765557a7766d86a9fbd494adb10a93f5fbd59d..8e9705f0f48412033703b21e0e41f6a3b0a3950c 100644 (file)
--- a/include/llvm/TableGen/Record.h
+++ b/include/llvm/TableGen/Record.h
@@ -107,15 +107,6 @@ public:   // These methods should only be called from subclasses of Init
   virtual Init *convertValue(   IntInit *II) { return nullptr; }
   virtual Init *convertValue(StringInit *SI) { return nullptr; }
   virtual Init *convertValue(  ListInit *LI) { return nullptr; }
   virtual Init *convertValue(   IntInit *II) { return nullptr; }
   virtual Init *convertValue(StringInit *SI) { return nullptr; }
   virtual Init *convertValue(  ListInit *LI) { return nullptr; }

-  virtual Init *convertValue( UnOpInit *UO) {
-    return convertValue((TypedInit*)UO);
-  }
-  virtual Init *convertValue( BinOpInit *BO) {
-    return convertValue((TypedInit*)BO);
-  }
-  virtual Init *convertValue( TernOpInit *TO) {
-    return convertValue((TypedInit*)TO);
-  }

   virtual Init *convertValue(VarBitInit *VB) { return nullptr; }
   virtual Init *convertValue(   DefInit *DI) { return nullptr; }
   virtual Init *convertValue(   DagInit *DI) { return nullptr; }
   virtual Init *convertValue(VarBitInit *VB) { return nullptr; }
   virtual Init *convertValue(   DefInit *DI) { return nullptr; }
   virtual Init *convertValue(   DagInit *DI) { return nullptr; }


@@ -240,8 +231,6 @@ public:
   using RecTy::convertValue;
   Init *convertValue( UnsetInit *UI) override { return (Init*)UI; }
   Init *convertValue(StringInit *SI) override { return (Init*)SI; }
   using RecTy::convertValue;
   Init *convertValue( UnsetInit *UI) override { return (Init*)UI; }
   Init *convertValue(StringInit *SI) override { return (Init*)SI; }

-  Init *convertValue(  UnOpInit *UO) override;
-  Init *convertValue( BinOpInit *BO) override;

   Init *convertValue( TypedInit *TI) override;
 
   std::string getAsString() const override { return "string"; }
   Init *convertValue( TypedInit *TI) override;
 
   std::string getAsString() const override { return "string"; }


@@ -296,8 +285,6 @@ public:
 
   using RecTy::convertValue;
   Init *convertValue( UnsetInit *UI) override { return (Init*)UI; }
 
   using RecTy::convertValue;
   Init *convertValue( UnsetInit *UI) override { return (Init*)UI; }

-  Init *convertValue(  UnOpInit *UO) override;
-  Init *convertValue( BinOpInit *BO) override;

   Init *convertValue(   DagInit *DI) override { return (Init*)DI; }
   Init *convertValue( TypedInit *TI) override;
 
   Init *convertValue(   DagInit *DI) override { return (Init*)DI; }
   Init *convertValue( TypedInit *TI) override;
 

diff --git a/lib/TableGen/Record.cpp b/lib/TableGen/Record.cpp
index 3089a13c6bc3b940c0401664c4975eaaa1d95dbb..534411364e9e656b7a1bb4d44c6b6b4b8a970446 100644 (file)
--- a/lib/TableGen/Record.cpp
+++ b/lib/TableGen/Record.cpp
@@ -247,31 +247,6 @@ bool IntRecTy::baseClassOf(const RecTy *RHS) const{
   return kind==BitRecTyKind || kind==BitsRecTyKind || kind==IntRecTyKind;
 }
 
   return kind==BitRecTyKind || kind==BitsRecTyKind || kind==IntRecTyKind;
 }
 

-Init *StringRecTy::convertValue(UnOpInit *UO) {
-  if (UO->getOpcode() == UnOpInit::CAST) {
-    Init *L = UO->getOperand()->convertInitializerTo(this);
-    if (!L) return nullptr;
-    if (L != UO->getOperand())
-      return UnOpInit::get(UnOpInit::CAST, L, StringRecTy::get());
-    return UO;
-  }
-
-  return convertValue((TypedInit*)UO);
-}
-
-Init *StringRecTy::convertValue(BinOpInit *BO) {
-  if (BO->getOpcode() == BinOpInit::STRCONCAT) {
-    Init *L = BO->getLHS()->convertInitializerTo(this);
-    Init *R = BO->getRHS()->convertInitializerTo(this);
-    if (!L || !R) return nullptr;
-    if (L != BO->getLHS() || R != BO->getRHS())
-      return BinOpInit::get(BinOpInit::STRCONCAT, L, R, StringRecTy::get());
-    return BO;
-  }
-
-  return convertValue((TypedInit*)BO);
-}
-

 
 Init *StringRecTy::convertValue(TypedInit *TI) {
   if (isa<StringRecTy>(TI->getType()))
 
 Init *StringRecTy::convertValue(TypedInit *TI) {
   if (isa<StringRecTy>(TI->getType()))


@@ -320,29 +295,6 @@ Init *DagRecTy::convertValue(TypedInit *TI) {
   return nullptr;
 }
 
   return nullptr;
 }
 

-Init *DagRecTy::convertValue(UnOpInit *UO) {
-  if (UO->getOpcode() == UnOpInit::CAST) {
-    Init *L = UO->getOperand()->convertInitializerTo(this);
-    if (!L) return nullptr;
-    if (L != UO->getOperand())
-      return UnOpInit::get(UnOpInit::CAST, L, DagRecTy::get());
-    return UO;
-  }
-  return nullptr;
-}
-
-Init *DagRecTy::convertValue(BinOpInit *BO) {
-  if (BO->getOpcode() == BinOpInit::CONCAT) {
-    Init *L = BO->getLHS()->convertInitializerTo(this);
-    Init *R = BO->getRHS()->convertInitializerTo(this);
-    if (!L || !R) return nullptr;
-    if (L != BO->getLHS() || R != BO->getRHS())
-      return BinOpInit::get(BinOpInit::CONCAT, L, R, DagRecTy::get());
-    return BO;
-  }
-  return nullptr;
-}
-

 RecordRecTy *RecordRecTy::get(Record *R) {
   return dyn_cast<RecordRecTy>(R->getDefInit()->getType());
 }
 RecordRecTy *RecordRecTy::get(Record *R) {
   return dyn_cast<RecordRecTy>(R->getDefInit()->getType());
 }