diff --git a/lib/Support/Process.cpp b/lib/Support/Process.cpp
index bf5779d69c6..f32355aefbb 100644
--- a/lib/Support/Process.cpp
+++ b/lib/Support/Process.cpp
@@ -83,12 +83,11 @@ static const char colorcodes[2][2][8][10] = {
  { ALLCOLORS("4",""), ALLCOLORS("4","1;") }
 };
 
-// This is set to true when Process::PreventCoreFiles() is called.
-static bool coreFilesPrevented = false;
+// A CMake option controls wheter we emit core dumps by default. An application
+// may disable core dumps by calling Process::PreventCoreFiles().
+static bool coreFilesPrevented = !LLVM_ENABLE_CRASH_DUMPS;
 
-bool Process::AreCoreFilesPrevented() {
-  return LLVM_ENABLE_CRASH_DUMPS ? coreFilesPrevented : false;
-}
+bool Process::AreCoreFilesPrevented() { return coreFilesPrevented; }
 
 // Include the platform-specific parts of this class.
 #ifdef LLVM_ON_UNIX