r203929 - Don't verify module inclusions in assembler files.

[Daniel Jasper]

Author: djasper
Date: Fri Mar 14 09:53:17 2014
New Revision: 203929

URL: http://llvm.org/viewvc/llvm-project?rev=203929&view=rev
Log:
Don't verify module inclusions in assembler files.

Added:
    cfe/trunk/test/Modules/Inputs/declare-use/s.h
    cfe/trunk/test/Modules/declare-use.S
Modified:
    cfe/trunk/lib/Lex/PPDirectives.cpp
    cfe/trunk/test/Modules/Inputs/declare-use/module.map
    cfe/trunk/test/lit.cfg

Modified: cfe/trunk/lib/Lex/PPDirectives.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/PPDirectives.cpp?rev=203929&r1=203928&r2=203929&view=diff
==============================================================================
--- cfe/trunk/lib/Lex/PPDirectives.cpp (original)
+++ cfe/trunk/lib/Lex/PPDirectives.cpp Fri Mar 14 09:53:17 2014
@@ -600,7 +600,7 @@ const FileEntry *Preprocessor::LookupFil
       Filename, FilenameLoc, isAngled, FromDir, CurDir, Includers, SearchPath,
       RelativePath, SuggestedModule, SkipCache);
   if (FE) {
-    if (SuggestedModule)
+    if (SuggestedModule && !LangOpts.AsmPreprocessor)
       HeaderInfo.getModuleMap().diagnoseHeaderInclusion(
           getModuleForLocation(FilenameLoc), FilenameLoc, Filename, FE);
     return FE;

Modified: cfe/trunk/test/Modules/Inputs/declare-use/module.map
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/declare-use/module.map?rev=203929&r1=203928&r2=203929&view=diff
==============================================================================
--- cfe/trunk/test/Modules/Inputs/declare-use/module.map (original)
+++ cfe/trunk/test/Modules/Inputs/declare-use/module.map Fri Mar 14 09:53:17 2014
@@ -42,6 +42,10 @@ module XG {
 module XH {
   header "h.h"
   header "h1.h"
+  header "s.h"
   use XC
   use XE
 }
+
+module XS {
+}

Added: cfe/trunk/test/Modules/Inputs/declare-use/s.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/declare-use/s.h?rev=203929&view=auto
==============================================================================
    (empty)

Added: cfe/trunk/test/Modules/declare-use.S
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/declare-use.S?rev=203929&view=auto
==============================================================================
--- cfe/trunk/test/Modules/declare-use.S (added)
+++ cfe/trunk/test/Modules/declare-use.S Fri Mar 14 09:53:17 2014
@@ -0,0 +1,5 @@
+// RUN: rm -rf %t
+// RUN: %clang -fmodule-maps -fmodules-cache-path=%t -fmodules-decluse -fmodule-name=XS -I %S/Inputs/declare-use -c %s -Xclang -verify
+// expected-no-diagnostics
+
+#include "s.h"

Modified: cfe/trunk/test/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/lit.cfg?rev=203929&r1=203928&r2=203929&view=diff
==============================================================================
--- cfe/trunk/test/lit.cfg (original)
+++ cfe/trunk/test/lit.cfg Fri Mar 14 09:53:17 2014
@@ -44,7 +44,7 @@ else:
 config.test_format = lit.formats.ShTest(execute_external)
 
 # suffixes: A list of file extensions to treat as test files.
-config.suffixes = ['.c', '.cpp', '.m', '.mm', '.cu', '.ll', '.cl', '.s']
+config.suffixes = ['.c', '.cpp', '.m', '.mm', '.cu', '.ll', '.cl', '.s', '.S']
 
 # excludes: A list of directories to exclude from the testsuite. The 'Inputs'
 # subdirectories contain auxiliary inputs for various tests in their parent