diff --git a/llvm/test/ExecutionEngine/Orc/empty-entry-function.ll b/llvm/test/ExecutionEngine/Orc/empty-entry-function.ll
new file mode 100644
--- /dev/null
+++ b/llvm/test/ExecutionEngine/Orc/empty-entry-function.ll
@@ -0,0 +1,4 @@
+; RUN: not lli --entry-function= %s 2>&1 | FileCheck %s
+;
+; Test empty --entry-function yields an error.
+; CHECK: error: --entry-function name cannot be empty
diff --git a/llvm/tools/lli/lli.cpp b/llvm/tools/lli/lli.cpp
--- a/llvm/tools/lli/lli.cpp
+++ b/llvm/tools/lli/lli.cpp
@@ -446,6 +446,12 @@
 
   ExitOnErr(loadDylibs());
 
+  if (EntryFunc.empty()) {
+    WithColor::error(errs(), argv[0])
+        << "--entry-function name cannot be empty\n";
+    exit(1);
+  }
+
   if (UseJITKind == JITKind::MCJIT)
     disallowOrcOptions();
   else