Commit 4069dd14 authored by Volodymyr Sapsai's avatar Volodymyr Sapsai
Browse files

[modules] Allow frameworks to have only a private module without a public one. 

Support only preferred spelling 'Modules/module.private.modulemap' and
not the deprecated 'module_private.map'.

rdar://problem/57715533

Reviewed By: bruno

Differential Revision: https://reviews.llvm.org/D75311
parent 7d973307

clang/lib/Lex/HeaderSearch.cpp

+10 −0
Original line number Diff line number Diff line
@@ -1568,6 +1568,16 @@ HeaderSearch::lookupModuleMapFile(const DirectoryEntry *Dir, bool IsFramework) { 
  llvm::sys::path::append(ModuleMapFileName, "module.map");

  if (auto F = FileMgr.getFile(ModuleMapFileName))

    return *F;



  // For frameworks, allow to have a private module map with a preferred

  // spelling when a public module map is absent.

  if (IsFramework) {

    ModuleMapFileName = Dir->getName();

    llvm::sys::path::append(ModuleMapFileName, "Modules",

                            "module.private.modulemap");

    if (auto F = FileMgr.getFile(ModuleMapFileName))

      return *F;

  }

  return nullptr;

}

clang/test/Modules/Inputs/implicit-private-without-public/DeprecatedModuleMapLocation.framework/PrivateHeaders/A.h

0 → 100644
+1 −0
Original line number Diff line number Diff line 
void a(void);

clang/test/Modules/Inputs/implicit-private-without-public/DeprecatedModuleMapLocation.framework/module_private.map

0 → 100644
+4 −0
Original line number Diff line number Diff line 
framework module DeprecatedModuleMapLocation_Private {

  header "A.h"

  export *

}

clang/test/Modules/Inputs/implicit-private-without-public/Foo.framework/Modules/module.private.modulemap

0 → 100644
+4 −0
Original line number Diff line number Diff line 
framework module Foo_Private {

  header "Foo_Priv.h"

  export *

}

clang/test/Modules/Inputs/implicit-private-without-public/Foo.framework/PrivateHeaders/Foo_Priv.h

0 → 100644
+1 −0
Original line number Diff line number Diff line 
void foo_private(void);