From f8012eb8267209fc9172cd30939e496caa401fd7 Mon Sep 17 00:00:00 2001 From: Craig Topper Date: Wed, 22 Apr 2015 02:09:45 +0000 Subject: [PATCH] [TableGen] Use 'isa' to identify UnsetInits rather than comparing with the singleton object created by UnsetInit::get(). Makes it more consistent with the other types. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@235465 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/TableGen/Record.cpp | 4 ++-- utils/TableGen/CodeGenDAGPatterns.cpp | 2 +- utils/TableGen/DAGISelMatcherGen.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/TableGen/Record.cpp b/lib/TableGen/Record.cpp index 3374432daa6..29217d74c96 100644 --- a/lib/TableGen/Record.cpp +++ b/lib/TableGen/Record.cpp @@ -517,7 +517,7 @@ std::string BitsInit::getAsString() const { // bits initializer will resolve into VarBitInit to keep the field name and bit // number used in targets with fixed insn length. static Init *fixBitInit(const RecordVal *RV, Init *Before, Init *After) { - if (RV || After != UnsetInit::get()) + if (RV || !isa(After)) return After; return Before; } @@ -1961,7 +1961,7 @@ bool Record::getValueAsBitOrUnset(StringRef FieldName, bool &Unset) const { PrintFatalError(getLoc(), "Record `" + getName() + "' does not have a field named `" + FieldName.str() + "'!\n"); - if (R->getValue() == UnsetInit::get()) { + if (isa(R->getValue())) { Unset = true; return false; } diff --git a/utils/TableGen/CodeGenDAGPatterns.cpp b/utils/TableGen/CodeGenDAGPatterns.cpp index 56743f3714a..2552050f678 100644 --- a/utils/TableGen/CodeGenDAGPatterns.cpp +++ b/utils/TableGen/CodeGenDAGPatterns.cpp @@ -2064,7 +2064,7 @@ TreePatternNode *TreePattern::ParseTreePattern(Init *TheInit, StringRef OpName){ } // ?:$name or just $name. - if (TheInit == UnsetInit::get()) { + if (isa(TheInit)) { if (OpName.empty()) error("'?' argument requires a name to match with operand list"); TreePatternNode *Res = new TreePatternNode(TheInit, 1); diff --git a/utils/TableGen/DAGISelMatcherGen.cpp b/utils/TableGen/DAGISelMatcherGen.cpp index eb806192bdc..afc500351a9 100644 --- a/utils/TableGen/DAGISelMatcherGen.cpp +++ b/utils/TableGen/DAGISelMatcherGen.cpp @@ -220,7 +220,7 @@ void MatcherGen::EmitLeafMatchCode(const TreePatternNode *N) { } // An UnsetInit represents a named node without any constraints. - if (N->getLeafValue() == UnsetInit::get()) { + if (isa(N->getLeafValue())) { assert(N->hasName() && "Unnamed ? leaf"); return; } -- 2.34.1