From 2af5e6fbf921401f6dc5d71a44cbc1b609c1d30c Mon Sep 17 00:00:00 2001 From: Craig Topper Date: Fri, 29 May 2015 05:51:32 +0000 Subject: [PATCH] [TableGen] Remove convertValue functions for UnOpInit, BinOpInit, and TernOpInit as they weren't able to be called. I don't think converting the inputs to the Ops was the right behavior anyway. llvm-svn: 238543 --- llvm/include/llvm/TableGen/Record.h | 13 ---------- llvm/lib/TableGen/Record.cpp | 48 ------------------------------------- 2 files changed, 61 deletions(-) diff --git a/llvm/include/llvm/TableGen/Record.h b/llvm/include/llvm/TableGen/Record.h index 7576555..8e9705f 100644 --- a/llvm/include/llvm/TableGen/Record.h +++ b/llvm/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( 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; } @@ -240,8 +231,6 @@ public: 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"; } @@ -296,8 +285,6 @@ public: 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; diff --git a/llvm/lib/TableGen/Record.cpp b/llvm/lib/TableGen/Record.cpp index 3089a13..5344113 100644 --- a/llvm/lib/TableGen/Record.cpp +++ b/llvm/lib/TableGen/Record.cpp @@ -247,31 +247,6 @@ bool IntRecTy::baseClassOf(const RecTy *RHS) const{ 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(TI->getType())) @@ -320,29 +295,6 @@ Init *DagRecTy::convertValue(TypedInit *TI) { 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(R->getDefInit()->getType()); } -- 2.7.4