Fix segfault (nullptr dereference) when passing a non-existent file t…

…o the Toy tutorial compiler Fix tensorflow/mlir#229 PiperOrigin-RevId: 279557863
llvm · Nov 10, 2019 · 85612fe · 85612fe
1 parent 1328f93
commit 85612fe
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 0 deletions.
diff --git a/mlir/examples/toy/Ch2/toyc.cpp b/mlir/examples/toy/Ch2/toyc.cpp
@@ -85,6 +85,8 @@ int dumpMLIR() {
   if (inputType != InputType::MLIR &&
       !llvm::StringRef(inputFilename).endswith(".mlir")) {
     auto moduleAST = parseInputFile(inputFilename);
+    if (!moduleAST)
+      return 6;
     mlir::OwningModuleRef module = mlirGen(context, *moduleAST);
     if (!module)
       return 1;

diff --git a/mlir/examples/toy/Ch3/toyc.cpp b/mlir/examples/toy/Ch3/toyc.cpp
@@ -85,6 +85,8 @@ int loadMLIR(llvm::SourceMgr &sourceMgr, mlir::MLIRContext &context,
   if (inputType != InputType::MLIR &&
       !llvm::StringRef(inputFilename).endswith(".mlir")) {
     auto moduleAST = parseInputFile(inputFilename);
+    if (!moduleAST)
+      return 6;
     module = mlirGen(context, *moduleAST);
     return !module ? 1 : 0;
   }

diff --git a/mlir/examples/toy/Ch4/toyc.cpp b/mlir/examples/toy/Ch4/toyc.cpp
@@ -86,6 +86,8 @@ int loadMLIR(llvm::SourceMgr &sourceMgr, mlir::MLIRContext &context,
   if (inputType != InputType::MLIR &&
       !llvm::StringRef(inputFilename).endswith(".mlir")) {
     auto moduleAST = parseInputFile(inputFilename);
+    if (!moduleAST)
+      return 6;
     module = mlirGen(context, *moduleAST);
     return !module ? 1 : 0;
   }

diff --git a/mlir/examples/toy/Ch5/toyc.cpp b/mlir/examples/toy/Ch5/toyc.cpp
@@ -88,6 +88,8 @@ int loadMLIR(llvm::SourceMgr &sourceMgr, mlir::MLIRContext &context,
   if (inputType != InputType::MLIR &&
       !llvm::StringRef(inputFilename).endswith(".mlir")) {
     auto moduleAST = parseInputFile(inputFilename);
+    if (!moduleAST)
+      return 6;
     module = mlirGen(context, *moduleAST);
     return !module ? 1 : 0;
   }

diff --git a/mlir/examples/toy/Ch6/toyc.cpp b/mlir/examples/toy/Ch6/toyc.cpp
@@ -106,6 +106,8 @@ int loadMLIR(mlir::MLIRContext &context, mlir::OwningModuleRef &module) {
   if (inputType != InputType::MLIR &&
       !llvm::StringRef(inputFilename).endswith(".mlir")) {
     auto moduleAST = parseInputFile(inputFilename);
+    if (!moduleAST)
+      return 6;
     module = mlirGen(context, *moduleAST);
     return !module ? 1 : 0;
   }

diff --git a/mlir/examples/toy/Ch7/toyc.cpp b/mlir/examples/toy/Ch7/toyc.cpp
@@ -106,6 +106,8 @@ int loadMLIR(mlir::MLIRContext &context, mlir::OwningModuleRef &module) {
   if (inputType != InputType::MLIR &&
       !llvm::StringRef(inputFilename).endswith(".mlir")) {
     auto moduleAST = parseInputFile(inputFilename);
+    if (!moduleAST)
+      return 6;
     module = mlirGen(context, *moduleAST);
     return !module ? 1 : 0;
   }