Revert "Modules: Make missing headers in a module.map a warning not an error."

This was committed accidentally.

llvm-svn: 197389

3 files changed, 1 insertions, 5 deletions

diff --git a/clang/test/Modules/Inputs/declare-use/custom.map b/clang/test/Modules/Inputs/declare-use/module.map
index c5f43e86dc1..ba615b67144 100644
--- a/clang/test/Modules/Inputs/declare-use/custom.map
+++ b/clang/test/Modules/Inputs/declare-use/module.map
@@ -26,7 +26,6 @@ module XE {
 
 module XF {
   header "f.h"
-  header "missing.h"
   use XA
   use XB
 }
diff --git a/clang/test/Modules/Inputs/modular_maps/modulea.map b/clang/test/Modules/Inputs/modular_maps/modulea.map
index e0da6f358d0..58c5f6464e4 100644
--- a/clang/test/Modules/Inputs/modular_maps/modulea.map
+++ b/clang/test/Modules/Inputs/modular_maps/modulea.map
@@ -1,7 +1,6 @@
 module A {
   header "common.h"
   header "a.h"
-  header "doesnotexists.h"
 }
 
 extern module B "moduleb.map"
diff --git a/clang/test/Modules/modular_maps.cpp b/clang/test/Modules/modular_maps.cpp
index cb305f2dfdb..9c9aba85a91 100644
--- a/clang/test/Modules/modular_maps.cpp
+++ b/clang/test/Modules/modular_maps.cpp
@@ -1,7 +1,5 @@
 // RUN: rm -rf %t
-// RUN: %clang_cc1 -fmodules -fmodule-maps -fmodules-cache-path=%t -fmodule-map-file=%S/Inputs/modular_maps/modulea.map -I %S/Inputs/modular_maps %s -verify
-
-// expected-warning@Inputs/modular_maps/modulea.map:4{{header 'doesnotexists.h' not found}}
+// RUN: %clang_cc1 -x objective-c++ -fmodules-cache-path=%t -fmodules -fmodule-map-file=%S/Inputs/modular_maps/modulea.map -I %S/Inputs/modular_maps %s -verify
 
 #include "common.h"
 #include "a.h"