54f0440c1f
inferring based on the current module at the point of creation. This should result in no functional change except when building a preprocessed module (or more generally when using #pragma clang module begin/end to switch module in the middle of a file), in which case it allows us to correctly track the owning module for declarations. We can't map from FileID to module in the preprocessed module case, since all modules would have the same FileID. There are still a couple of remaining places that try to infer a module from a source location; I'll clean those up in follow-up changes. llvm-svn: 303322
109 lines
4.1 KiB
C++
109 lines
4.1 KiB
C++
// RUN: rm -rf %t
|
|
// RUN: mkdir %t
|
|
|
|
// RUN: not %clang_cc1 -fmodules -fmodule-name=file -I%S/Inputs/preprocess -x c++-module-map %S/Inputs/preprocess/module.modulemap -E 2>&1 | FileCheck %s --check-prefix=MISSING-FWD
|
|
// MISSING-FWD: module 'fwd' is needed
|
|
|
|
// RUN: %clang_cc1 -fmodules -fmodule-name=fwd -I%S/Inputs/preprocess -x c++-module-map %S/Inputs/preprocess/module.modulemap -emit-module -o %t/fwd.pcm
|
|
|
|
// Check that we can preprocess modules, and get the expected output.
|
|
// RUN: %clang_cc1 -fmodules -fmodule-name=file -fmodule-file=%t/fwd.pcm -I%S/Inputs/preprocess -x c++-module-map %S/Inputs/preprocess/module.modulemap -E -o %t/no-rewrite.ii
|
|
// RUN: %clang_cc1 -fmodules -fmodule-name=file -fmodule-file=%t/fwd.pcm -I%S/Inputs/preprocess -x c++-module-map %S/Inputs/preprocess/module.modulemap -E -frewrite-includes -o %t/rewrite.ii
|
|
//
|
|
// RUN: FileCheck %s --input-file %t/no-rewrite.ii --check-prefix=CHECK --check-prefix=NO-REWRITE
|
|
// RUN: FileCheck %s --input-file %t/rewrite.ii --check-prefix=CHECK --check-prefix=REWRITE
|
|
|
|
// Check that we can build a module from the preprocessed output.
|
|
// FIXME: For now, we need the headers to exist.
|
|
// RUN: touch %t/file.h %t/file2.h
|
|
// RUN: %clang_cc1 -fmodules -fmodule-name=file -fmodule-file=%t/fwd.pcm -x c++-module-map-cpp-output %t/no-rewrite.ii -emit-module -o %t/no-rewrite.pcm
|
|
// RUN: %clang_cc1 -fmodules -fmodule-name=file -fmodule-file=%t/fwd.pcm -x c++-module-map-cpp-output %t/rewrite.ii -emit-module -o %t/rewrite.pcm
|
|
|
|
// Check that we can load the original module map in the same compilation (this
|
|
// could happen if we had a redundant -fmodule-map-file= in the original
|
|
// build).
|
|
// RUN: %clang_cc1 -fmodules -fmodule-name=file -fmodule-file=%t/fwd.pcm -fmodule-map-file=%S/Inputs/preprocess/module.modulemap -x c++-module-map-cpp-output %t/rewrite.ii -emit-module -o /dev/null
|
|
|
|
// Check the module we built works.
|
|
// RUN: %clang_cc1 -fmodules -fmodule-file=%t/no-rewrite.pcm %s -I%t -verify -fno-modules-error-recovery
|
|
// RUN: %clang_cc1 -fmodules -fmodule-file=%t/rewrite.pcm %s -I%t -verify -fno-modules-error-recovery -DREWRITE
|
|
|
|
|
|
// == module map
|
|
// CHECK: # 1 "{{.*}}module.modulemap"
|
|
// CHECK: module file {
|
|
// CHECK: header "file.h"
|
|
// CHECK: header "file2.h"
|
|
// CHECK: }
|
|
|
|
// == file.h
|
|
// CHECK: # 1 "<module-includes>"
|
|
// REWRITE: #if 0
|
|
// REWRITE: #include "file.h"
|
|
// REWRITE: #endif
|
|
//
|
|
// FIXME: It would be preferable to consistently put the module begin/end in
|
|
// the same file, but the relative ordering of PP callbacks and module
|
|
// begin/end tokens makes that difficult.
|
|
//
|
|
// REWRITE: #pragma clang module begin file
|
|
// CHECK: # 1 "{{.*}}file.h" 1
|
|
// NO-REWRITE: #pragma clang module begin file
|
|
// NO-REWRITE: # 1 "{{.*}}file.h"{{$}}
|
|
//
|
|
// CHECK: struct __FILE;
|
|
// CHECK: #pragma clang module import fwd /* clang {{-E|-frewrite-includes}}: implicit import
|
|
// CHECK: typedef struct __FILE FILE;
|
|
//
|
|
// REWRITE: #pragma clang module end
|
|
// CHECK: # 2 "<module-includes>" 2
|
|
// NO-REWRITE: #pragma clang module end
|
|
|
|
// == file2.h
|
|
// REWRITE: #if 0
|
|
// REWRITE: #include "file2.h"
|
|
// REWRITE: #endif
|
|
//
|
|
// REWRITE: #pragma clang module begin file
|
|
// CHECK: # 1 "{{.*}}file2.h" 1
|
|
// NO-REWRITE: #pragma clang module begin file
|
|
//
|
|
// ==== recursively re-enter file.h
|
|
// REWRITE: #if 0
|
|
// REWRITE: #include "file.h"
|
|
// REWRITE: #endif
|
|
//
|
|
// REWRITE: #pragma clang module begin file
|
|
// CHECK: # 1 "{{.*}}file.h" 1
|
|
// NO-REWRITE: #pragma clang module begin file
|
|
// NO-REWRITE: # 1 "{{.*}}file.h"{{$}}
|
|
//
|
|
// CHECK: struct __FILE;
|
|
// CHECK: #pragma clang module import fwd /* clang {{-E|-frewrite-includes}}: implicit import
|
|
// CHECK: typedef struct __FILE FILE;
|
|
//
|
|
// REWRITE: #pragma clang module end
|
|
// CHECK: # 2 "{{.*}}file2.h" 2
|
|
// NO-REWRITE: #pragma clang module end
|
|
// NO-REWRITE: # 2 "{{.*}}file2.h"{{$}}
|
|
// ==== return to file2.h
|
|
//
|
|
// CHECK: extern int file2;
|
|
//
|
|
// REWRITE: #pragma clang module end
|
|
// CHECK: # 3 "<module-includes>" 2
|
|
// NO-REWRITE: #pragma clang module end
|
|
|
|
|
|
__FILE *a; // expected-error {{declaration of '__FILE' must be imported}}
|
|
#ifdef REWRITE
|
|
// expected-note@rewrite.ii:1 {{here}}
|
|
#else
|
|
// expected-note@no-rewrite.ii:1 {{here}}
|
|
#endif
|
|
|
|
#pragma clang module import file
|
|
|
|
FILE *b;
|
|
int x = file2;
|