maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Allow inferred submodules for any (sub)module that has an umbrella header 

llvm-svn: 145945
This commit is contained in:
Douglas Gregor 2011-12-06 17:34:58 +00:00
parent ac35a4d0f7
commit dd005f69f0
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
clang/lib/Lex/ModuleMap.cpp
View File

@ -900,16 +900,16 @@ void ModuleMapParser::parseInferredSubmoduleDecl(bool Explicit) {
}
// Inferred modules must have umbrella headers.
if (!Failed && !ActiveModule->getTopLevelModule()->UmbrellaHeader) {
if (!Failed && !ActiveModule->UmbrellaHeader) {
Diags.Report(StarLoc, diag::err_mmap_inferred_no_umbrella);
Failed = true;
}
// Check for redefinition of an inferred module.
if (!Failed && ActiveModule->getTopLevelModule()->InferSubmodules) {
if (!Failed && ActiveModule->InferSubmodules) {
Diags.Report(StarLoc, diag::err_mmap_inferred_redef);
if (ActiveModule->getTopLevelModule()->InferredSubmoduleLoc.isValid())
Diags.Report(ActiveModule->getTopLevelModule()->InferredSubmoduleLoc,
if (ActiveModule->InferredSubmoduleLoc.isValid())
Diags.Report(ActiveModule->InferredSubmoduleLoc,
diag::note_mmap_prev_definition);
Failed = true;
}
@ -927,10 +927,9 @@ void ModuleMapParser::parseInferredSubmoduleDecl(bool Explicit) {
}
// Note that we have an inferred submodule.
Module *TopModule = ActiveModule->getTopLevelModule();
TopModule->InferSubmodules = true;
TopModule->InferredSubmoduleLoc = StarLoc;
TopModule->InferExplicitSubmodules = Explicit;
ActiveModule->InferSubmodules = true;
ActiveModule->InferredSubmoduleLoc = StarLoc;
ActiveModule->InferExplicitSubmodules = Explicit;
// Parse the opening brace.
if (!Tok.is(MMToken::LBrace)) {
@ -952,7 +951,7 @@ void ModuleMapParser::parseInferredSubmoduleDecl(bool Explicit) {
case MMToken::ExportKeyword: {
consumeToken();
if (Tok.is(MMToken::Star))
TopModule->InferExportWildcard = true;
ActiveModule->InferExportWildcard = true;
else
Diags.Report(Tok.getLocation(),
diag::err_mmap_expected_export_wildcard);

4
clang/test/Modules/Inputs/DependsOnModule.framework/module.map
View File

@ -6,5 +6,9 @@ framework module DependsOnModule {
}
explicit framework module SubFramework {
umbrella "SubFramework.h"
module * {
export *
}
}
}

2
clang/test/Modules/auto-module-import.c
View File

@ -24,7 +24,7 @@ void testSubframeworkOther() {
}
// Test header cross-subframework include pattern.
#include <DependsOnModule/../Frameworks/SubFramework.framework/Headers/Other.h> // expected-warning{{treating #include as an import of module 'DependsOnModule.SubFramework'}}
#include <DependsOnModule/../Frameworks/SubFramework.framework/Headers/Other.h> // expected-warning{{treating #include as an import of module 'DependsOnModule.SubFramework.Other'}}
void testSubframeworkOtherAgain() {
double *sfo1 = sub_framework_other;