[PATCH] D123104: [Modules] Use looked-up filename when looking for module maps

[Duncan P. N. Exon Smith via Phabricator via cfe-commits]

dexonsmith added a comment.

In D123104#3439261 <https://reviews.llvm.org/D123104#3439261>, @bnbarham wrote:

> Looks like there's more changes required for modulemap-collision.m to actually pass. I'll try figure those out when I have the time.

Capturing `clang -check` error since the build log won't be available forever:

  error: 'warning' diagnostics seen but not expected: 
  
    File /var/lib/buildkite-agent/builds/llvm-project/build/tools/clang/test/Modules/Output/modulemap-collision.m.tmp/build/module.private.modulemap Line 1: private submodule 'A.Private' in private module map, expected top-level module
  
  error: 'note' diagnostics seen but not expected: 
  
    File /var/lib/buildkite-agent/builds/llvm-project/build/tools/clang/test/Modules/Output/modulemap-collision.m.tmp/build/module.private.modulemap Line 1: rename 'A.Private' to ensure it can be found by name

I wonder if https://github.com/apple/llvm-project/commit/67c70038bcc0d771e2e39c875ad7d69e329c7fc4 could be related. A long shot (I can't see how that could be it!), but the other not-upstreamed patches look even less relevant.



================
Comment at: clang/test/Modules/modulemap-collision.m:12
+// RUN: sed -e "s:DUMMY_DIR:%t:g" %S/Inputs/all-product-headers.yaml > %t/build/all-product-headers.yaml
+// RUN: %clang_cc1 -fsyntax-only -ivfsoverlay %t/build/all-product-headers.yaml -F%t/build -fmodules -fimplicit-module-maps -fmodules-cache-path=tmp -x objective-c %s -verify
+
----------------
Just noticed `-fmodules-cache-path=tmp`, which seems like it should be `=%t/cache` instead... but I doubt that's the cause of the failure.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D123104/new/

https://reviews.llvm.org/D123104