Skip to content

Commit

Permalink
[C++20] [Modules] Don't skip pragma diagnostic mappings
Browse files Browse the repository at this point in the history
Close #75057

Previously, I thought the diagnostic mappings is not meaningful with
modules incorrectly. And this problem get revealed by another change
recently. So this patch tried to rever the previous "optimization"
partially.
  • Loading branch information
ChuanqiXu9 committed Apr 30, 2024
1 parent 4a84d8e commit ec527b2
Show file tree
Hide file tree
Showing 3 changed files with 66 additions and 2 deletions.
1 change: 0 additions & 1 deletion clang/lib/Frontend/FrontendActions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,6 @@ GenerateModuleInterfaceAction::CreateASTConsumer(CompilerInstance &CI,
StringRef InFile) {
CI.getHeaderSearchOpts().ModulesSkipDiagnosticOptions = true;
CI.getHeaderSearchOpts().ModulesSkipHeaderSearchPaths = true;
CI.getHeaderSearchOpts().ModulesSkipPragmaDiagnosticMappings = true;

std::vector<std::unique_ptr<ASTConsumer>> Consumers =
CreateMultiplexConsumer(CI, InFile);
Expand Down
1 change: 0 additions & 1 deletion clang/lib/Serialization/GeneratePCH.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ void ReducedBMIGenerator::HandleTranslationUnit(ASTContext &Ctx) {
getPreprocessor().getHeaderSearchInfo().getHeaderSearchOpts();
HSOpts.ModulesSkipDiagnosticOptions = true;
HSOpts.ModulesSkipHeaderSearchPaths = true;
HSOpts.ModulesSkipPragmaDiagnosticMappings = true;

PCHGenerator::HandleTranslationUnit(Ctx);

Expand Down
66 changes: 66 additions & 0 deletions clang/test/Modules/pr75057.cppm
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
// RUN: rm -rf %t
// RUN: mkdir -p %t
// RUN: split-file %s %t
//
// Treat the behavior of using headers as baseline.
// RUN: %clang_cc1 -std=c++20 %t/use-header.cc -isystem %t -fsyntax-only -verify
//
// RUN: %clang_cc1 -std=c++20 %t/a.cppm -isystem %t -emit-module-interface -o %t/a.pcm
// RUN: %clang_cc1 -std=c++20 %t/use-module.cc -isystem %t -fmodule-file=a=%t/a.pcm -fsyntax-only -verify

// Test again with reduced BMI.
// RUN: %clang_cc1 -std=c++20 %t/a.cppm -isystem %t -emit-reduced-module-interface -o %t/a.pcm
// RUN: %clang_cc1 -std=c++20 %t/use-module.cc -isystem %t -fmodule-file=a=%t/a.pcm -fsyntax-only -verify

//--- sys.h
#ifndef SYS_H
#define SYS_H

#pragma GCC system_header

template <class C>
struct [[deprecated]] iterator {};

_Pragma("GCC diagnostic push")
_Pragma("GCC diagnostic ignored \"-Wdeprecated\"")
_Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")

template <class C>
struct reverse_iterator
: public iterator<C> {};

_Pragma("GCC diagnostic pop")

template <class T>
class C {
public:
void i() {
reverse_iterator<T> i;
}
};

#endif

//--- use-header.cc
// expected-no-diagnostics
// However, we see unexpected warnings
#include <sys.h>

void use() {
C<int>().i();
}

//--- a.cppm
module;
#include <sys.h>
export module a;
export using ::iterator;
export using ::C;

//--- use-module.cc
// expected-no-diagnostics
import a;

void use() {
C<int>().i();
}

0 comments on commit ec527b2

Please sign in to comment.