Improve error when function return type was expected to be void

bitwalker · bitwalker · commit a41787fc0b47 · 2020-03-07T15:10:48.000-05:00
diff --git a/mlir/lib/Target/LLVMIR/ModuleTranslation.cpp b/mlir/lib/Target/LLVMIR/ModuleTranslation.cpp
@@ -337,7 +337,10 @@ LogicalResult ModuleTranslation::convertOperation(Operation &opInst,
       return success();
     }
     // Check that LLVM call returns void for 0-result functions.
-    return success(result->getType()->isVoidTy());
+    if (!result->getType()->isVoidTy()) {
+      return opInst.emitError("expected callee to return void");
+    }
+    return success();
   }
 
   if (auto invOp = dyn_cast<LLVM::InvokeOp>(opInst)) {

Original file line number	Diff line number	Diff line change
`@@ -337,7 +337,10 @@ LogicalResult ModuleTranslation::convertOperation(Operation &opInst,`
`337`	`337`	`return success();`
`338`	`338`	`}`
`339`	`339`	`// Check that LLVM call returns void for 0-result functions.`
`340`		`- return success(result->getType()->isVoidTy());`
	`340`	`+ if (!result->getType()->isVoidTy()) {`
	`341`	`+ return opInst.emitError("expected callee to return void");`
	`342`	`+ }`
	`343`	`+ return success();`
`341`	`344`	`}`
`342`	`345`
`343`	`346`	`if (auto invOp = dyn_cast<LLVM::InvokeOp>(opInst)) {`