From: David Greene Date: Wed, 19 Oct 2011 13:03:51 +0000 (+0000) Subject: Fix Name Access X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=91919cd8166bb60145efe54dd790b98521b4328a;p=oota-llvm.git Fix Name Access Get the Record name as a string explicitly to avoid asserts. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@142515 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/TableGen/TGParser.cpp b/lib/TableGen/TGParser.cpp index 5dc25e9827a..1e5b55fdf93 100644 --- a/lib/TableGen/TGParser.cpp +++ b/lib/TableGen/TGParser.cpp @@ -1694,8 +1694,9 @@ bool TGParser::ParseDef(MultiClass *CurMultiClass) { } else { // Otherwise, a def inside a multiclass, add it to the multiclass. for (unsigned i = 0, e = CurMultiClass->DefPrototypes.size(); i != e; ++i) - if (CurMultiClass->DefPrototypes[i]->getName() == CurRec->getName()) { - Error(DefLoc, "def '" + CurRec->getName() + + if (CurMultiClass->DefPrototypes[i]->getNameInit() + == CurRec->getNameInit()) { + Error(DefLoc, "def '" + CurRec->getNameInitAsString() + "' already defined in this multiclass!"); return true; }