[llvm-branch-commits] [llvm-branch] r119218 - /llvm/branches/Apple/whitney/utils/TableGen/TGParser.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Mon Nov 15 15:44:13 2010
New Revision: 119218

URL: http://llvm.org/viewvc/llvm-project?rev=119218&view=rev
Log:
Merge r117863:
--
Author: Chris Lattner <clattner at apple.com>
Date:   Sun Oct 31 19:27:15 2010 +0000

    fix a crash on:

    let Constraints = "$val = $dst", Defs = [EFLAGS] in, isCodeGenOnly = 1 {

    we now get:

    X86InstrCompiler.td:653:52: error: Expected class, def, defm, multiclass or let definition
    let Constraints = "$val = $dst", Defs = [EFLAGS] in, isCodeGenOnly = 1 {
                                                       ^

Modified:
    llvm/branches/Apple/whitney/utils/TableGen/TGParser.cpp

Modified: llvm/branches/Apple/whitney/utils/TableGen/TGParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/whitney/utils/TableGen/TGParser.cpp?rev=119218&r1=119217&r2=119218&view=diff
==============================================================================
--- llvm/branches/Apple/whitney/utils/TableGen/TGParser.cpp (original)
+++ llvm/branches/Apple/whitney/utils/TableGen/TGParser.cpp Mon Nov 15 15:44:13 2010
@@ -2087,7 +2087,8 @@
 ///   Object ::= LETCommand Object
 bool TGParser::ParseObject(MultiClass *MC) {
   switch (Lex.getCode()) {
-  default: assert(0 && "This is not an object");
+  default:
+    return TokError("Expected class, def, defm, multiclass or let definition");
   case tgtok::Let:   return ParseTopLevelLet(MC);
   case tgtok::Def:   return ParseDef(MC);
   case tgtok::Defm:  return ParseDefm(MC);