diff --git a/lib/Support/Debug.cpp b/lib/Support/Debug.cpp
index 57ed27a5b95..f87cddfe4e8 100644
--- a/lib/Support/Debug.cpp
+++ b/lib/Support/Debug.cpp
@@ -49,5 +49,9 @@ namespace {
 // with the -debug-only=X option.
 //
 bool isCurrentDebugType(const char *DebugType) {
+#ifndef NDEBUG
   return CurrentDebugType.empty() || DebugType == CurrentDebugType;
+#else
+  return false;
+#endif
 }
diff --git a/support/lib/Support/Debug.cpp b/support/lib/Support/Debug.cpp
index 57ed27a5b95..f87cddfe4e8 100644
--- a/support/lib/Support/Debug.cpp
+++ b/support/lib/Support/Debug.cpp
@@ -49,5 +49,9 @@ namespace {
 // with the -debug-only=X option.
 //
 bool isCurrentDebugType(const char *DebugType) {
+#ifndef NDEBUG
   return CurrentDebugType.empty() || DebugType == CurrentDebugType;
+#else
+  return false;
+#endif
 }