Don't crash if there is no Inst class in the tablegen file!

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

diff --git a/support/tools/TableGen/CodeEmitterGen.cpp b/support/tools/TableGen/CodeEmitterGen.cpp
index 90497cc620bfeb0d46e795f13d6b35a1361ae66f..8805c7cab09f288efafae94ef1f80afc056ad92a 100644 (file)
--- a/support/tools/TableGen/CodeEmitterGen.cpp
+++ b/support/tools/TableGen/CodeEmitterGen.cpp
@@ -2,7 +2,7 @@
 #include "Record.h"
 #include "CodeEmitterGen.h"
 
-void CodeEmitterGen::createEmitter(std::ostream &o) {
+int CodeEmitterGen::createEmitter(std::ostream &o) {
   std::vector<Record*> Insts;
 
   const std::map<std::string, Record*> &Defs = Records.getDefs();
@@ -31,8 +31,12 @@ void CodeEmitterGen::createEmitter(std::ostream &o) {
       << "      DEBUG(std::cerr << \"Emitting " << R->getName() << "\\n\");\n";
 
     const RecordVal *InstVal = R->getValue("Inst");
-    Init *InitVal = InstVal->getValue();
+    if (!InstVal) {
+      std::cerr << "No 'Inst' record found in target description file!\n";
+      return 1;
+    }
 
+    Init *InitVal = InstVal->getValue();
     assert(dynamic_cast<BitsInit*>(InitVal) &&
            "Can only handle undefined bits<> types!");
     BitsInit *BI = (BitsInit*)InitVal;
@@ -225,4 +229,5 @@ void CodeEmitterGen::createEmitter(std::ostream &o) {
     << "  }\n"
     << "  return Value;\n"
     << "}\n";
+  return 0;
 }

diff --git a/support/tools/TableGen/CodeEmitterGen.h b/support/tools/TableGen/CodeEmitterGen.h
index 098816a1442ae98ed3cc9e268939f49282750f81..cf000c47b5822795192f79fc24b119b972d35e90 100644 (file)
--- a/support/tools/TableGen/CodeEmitterGen.h
+++ b/support/tools/TableGen/CodeEmitterGen.h
@@ -15,7 +15,7 @@ struct CodeEmitterGen {
 public:
   CodeEmitterGen(RecordKeeper &R) : Records(R) {}
   
-  void createEmitter(std::ostream &o);
+  int createEmitter(std::ostream &o);
   void emitMachineOpEmitter(std::ostream &o, const std::string &Namespace);
   void emitGetValueBit(std::ostream &o, const std::string &Namespace);
 };

diff --git a/support/tools/TableGen/TableGen.cpp b/support/tools/TableGen/TableGen.cpp
index 81529f0926d97532546150ee2040e01a41633a46..17f2b2e7181600667299149ec0f71017dcd94bbc 100644 (file)
--- a/support/tools/TableGen/TableGen.cpp
+++ b/support/tools/TableGen/TableGen.cpp
@@ -394,10 +394,12 @@ int main(int argc, char **argv) {
     RemoveFileOnSignal(OutputFilename);
   }
 
+  int ErrorCode = 0;
+
   switch (Action) {
   case Parse: ParseMachineCode(); break;
   case GenEmitter:
-    CodeEmitterGen(Records).createEmitter(*Out);
+    ErrorCode = CodeEmitterGen(Records).createEmitter(*Out);
     break;
   case PrintRecords:
     *Out << Records;           // No argument, dump all contents
@@ -421,5 +423,5 @@ int main(int argc, char **argv) {
   }
 
   if (Out != &std::cout) delete Out;
-  return 0;
+  return ErrorCode;
 }

diff --git a/utils/TableGen/CodeEmitterGen.cpp b/utils/TableGen/CodeEmitterGen.cpp
index 90497cc620bfeb0d46e795f13d6b35a1361ae66f..8805c7cab09f288efafae94ef1f80afc056ad92a 100644 (file)
--- a/utils/TableGen/CodeEmitterGen.cpp
+++ b/utils/TableGen/CodeEmitterGen.cpp
@@ -2,7 +2,7 @@
 #include "Record.h"
 #include "CodeEmitterGen.h"
 
-void CodeEmitterGen::createEmitter(std::ostream &o) {
+int CodeEmitterGen::createEmitter(std::ostream &o) {
   std::vector<Record*> Insts;
 
   const std::map<std::string, Record*> &Defs = Records.getDefs();
@@ -31,8 +31,12 @@ void CodeEmitterGen::createEmitter(std::ostream &o) {
       << "      DEBUG(std::cerr << \"Emitting " << R->getName() << "\\n\");\n";
 
     const RecordVal *InstVal = R->getValue("Inst");
-    Init *InitVal = InstVal->getValue();
+    if (!InstVal) {
+      std::cerr << "No 'Inst' record found in target description file!\n";
+      return 1;
+    }
 
+    Init *InitVal = InstVal->getValue();
     assert(dynamic_cast<BitsInit*>(InitVal) &&
            "Can only handle undefined bits<> types!");
     BitsInit *BI = (BitsInit*)InitVal;
@@ -225,4 +229,5 @@ void CodeEmitterGen::createEmitter(std::ostream &o) {
     << "  }\n"
     << "  return Value;\n"
     << "}\n";
+  return 0;
 }

diff --git a/utils/TableGen/CodeEmitterGen.h b/utils/TableGen/CodeEmitterGen.h
index 098816a1442ae98ed3cc9e268939f49282750f81..cf000c47b5822795192f79fc24b119b972d35e90 100644 (file)
--- a/utils/TableGen/CodeEmitterGen.h
+++ b/utils/TableGen/CodeEmitterGen.h
@@ -15,7 +15,7 @@ struct CodeEmitterGen {
 public:
   CodeEmitterGen(RecordKeeper &R) : Records(R) {}
   
-  void createEmitter(std::ostream &o);
+  int createEmitter(std::ostream &o);
   void emitMachineOpEmitter(std::ostream &o, const std::string &Namespace);
   void emitGetValueBit(std::ostream &o, const std::string &Namespace);
 };

diff --git a/utils/TableGen/TableGen.cpp b/utils/TableGen/TableGen.cpp
index 81529f0926d97532546150ee2040e01a41633a46..17f2b2e7181600667299149ec0f71017dcd94bbc 100644 (file)
--- a/utils/TableGen/TableGen.cpp
+++ b/utils/TableGen/TableGen.cpp
@@ -394,10 +394,12 @@ int main(int argc, char **argv) {
     RemoveFileOnSignal(OutputFilename);
   }
 
+  int ErrorCode = 0;
+
   switch (Action) {
   case Parse: ParseMachineCode(); break;
   case GenEmitter:
-    CodeEmitterGen(Records).createEmitter(*Out);
+    ErrorCode = CodeEmitterGen(Records).createEmitter(*Out);
     break;
   case PrintRecords:
     *Out << Records;           // No argument, dump all contents
@@ -421,5 +423,5 @@ int main(int argc, char **argv) {
   }
 
   if (Out != &std::cout) delete Out;
-  return 0;
+  return ErrorCode;
 }