This is an archive of the discontinued LLVM Phabricator instance.

Differential D120463

[clang][modules] NFC: Simplify and clarify test
ClosedPublic

Authored by jansvoboda11 on Feb 24 2022, 1:36 AM.

Details

Reviewers
ilyakuteev
Bigcheese
dexonsmith
Commits
rG242b24c18491: [clang][modules] NFC: Simplify and clarify test
Summary

This patch simplifies a test that checks only used module map files are reported as input files in PCM files.

Instead of using opaque diff, this patch uses clang -module-file-info and FileCheck to verify this.

Diff Detail

Event Timeline

jansvoboda11 requested review of this revision.Feb 24 2022, 1:36 AM
jansvoboda11 created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptFeb 24 2022, 1:36 AM
Herald added a subscriber: cfe-commits. · View Herald Transcript
jansvoboda11 added a child revision: D120464: [clang][modules] Report module maps affecting `no_undeclared_includes` modules.Feb 24 2022, 1:40 AM
Harbormaster completed remote builds in B151208: Diff 411041.Feb 24 2022, 2:07 AM
dexonsmith accepted this revision.Mar 1 2022, 4:49 PM

LGTM, thanks!

This revision is now accepted and ready to land.Mar 1 2022, 4:49 PM
Herald added a project: Restricted Project. · View Herald TranscriptMar 1 2022, 4:49 PM
This revision was landed with ongoing or failed builds.Mar 7 2022, 1:47 AM
Closed by commit rG242b24c18491: [clang][modules] NFC: Simplify and clarify test (authored by jansvoboda11). · Explain Why
This revision was automatically updated to reflect the committed changes.
jansvoboda11 added a commit: rG242b24c18491: [clang][modules] NFC: Simplify and clarify test.

Revision Contents

PathSize
clang/
test/
Modules/
Inputs/
AddRemoveIrrelevantModuleMap/
36 lines

Diff 411041

clang/test/Modules/Inputs/AddRemoveIrrelevantModuleMap/a.modulemap

  • This file was deleted.
module a { }

clang/test/Modules/Inputs/AddRemoveIrrelevantModuleMap/b.modulemap

  • This file was deleted.
module b { }

clang/test/Modules/add-remove-irrelevant-module-map.m

// RUN: rm -rf %t // RUN: rm -rf %t && mkdir %t
// RUN: rm -rf %t.mcp // RUN: split-file %s %t
// RUN: mkdir -p %t
// Build without b.modulemap
// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t.mcp -fdisable-module-hash -fmodule-map-file=%S/Inputs/AddRemoveIrrelevantModuleMap/a.modulemap %s -verify
// RUN: cp %t.mcp/a.pcm %t/a.pcm
// Build with b.modulemap
// RUN: rm -rf %t.mcp
// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t.mcp -fdisable-module-hash -fmodule-map-file=%S/Inputs/AddRemoveIrrelevantModuleMap/a.modulemap -fmodule-map-file=%S/Inputs/AddRemoveIrrelevantModuleMap/b.modulemap %s -verify
// RUN: not diff %t.mcp/a.pcm %t/a.pcm
// expected-no-diagnostics //--- a.modulemap
module a {}
//--- b.modulemap
module b {}
//--- test-simple.m
// expected-no-diagnostics
@import a; @import a;
// Build without b.modulemap:
//
// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t/cache -fdisable-module-hash \
// RUN: -fmodule-map-file=%t/a.modulemap %t/test-simple.m -verify
// RUN: mv %t/cache %t/cache-without-b
// Build with b.modulemap:
//
// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t/cache -fdisable-module-hash \
// RUN: -fmodule-map-file=%t/a.modulemap -fmodule-map-file=%t/b.modulemap %t/test-simple.m -verify
// RUN: mv %t/cache %t/cache-with-b
// Neither PCM file considers 'b.modulemap' an input:
//
// RUN: %clang_cc1 -module-file-info %t/cache-without-b/a.pcm | FileCheck %s
// RUN: %clang_cc1 -module-file-info %t/cache-with-b/a.pcm | FileCheck %s
// CHECK-NOT: Input file: {{.*}}/b.modulemap