Skip to content

Commit 5cab132

Browse files
jansvoboda11jansvoboda11
committed
[clang][lex] Introduce new single-module-parse mode
1 parent 72b2219 commit 5cab132

File tree

5 files changed

+134
-9
lines changed

5 files changed

+134
-9
lines changed

‎clang/include/clang/Driver/Options.td‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3305,6 +3305,10 @@ def fno_modules_prune_non_affecting_module_map_files :
33053305
Group<f_Group>, Flags<[]>, Visibility<[CC1Option]>,
33063306
MarshallingInfoNegativeFlag<HeaderSearchOpts<"ModulesPruneNonAffectingModuleMaps">>,
33073307
HelpText<"Do not prune non-affecting module map files when writing module files">;
3308+
def fmodules_single_module_parse_mode :
3309+
Flag<["-"], "fmodules-single-module-parse-mode">,
3310+
Group<f_Group>, Flags<[]>, Visibility<[CC1Option]>,
3311+
MarshallingInfoFlag<PreprocessorOpts<"SingleModuleParseMode">>;
33083312

33093313
def fincremental_extensions :
33103314
Flag<["-"], "fincremental-extensions">,

‎clang/include/clang/Lex/PreprocessorOptions.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,13 @@ class PreprocessorOptions {
152152
/// that the client can get the maximum amount of information from the parser.
153153
bool SingleFileParseMode = false;
154154

155+
/// When enabled, preprocessor is in a mode for parsing a single module only.
156+
///
157+
/// Disables imports of other modules and if there are any unresolved
158+
/// identifiers in preprocessor directive conditions it causes all blocks to
159+
/// be skipped so that the client can get a strict subset of the contents.
160+
bool SingleModuleParseMode = false;
161+
155162
/// When enabled, the preprocessor will construct editor placeholder tokens.
156163
bool LexEditorPlaceholders = true;
157164

‎clang/lib/Lex/PPDirectives.cpp‎

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2074,10 +2074,11 @@ void Preprocessor::HandleIncludeDirective(SourceLocation HashLoc,
20742074
return;
20752075

20762076
if (FilenameTok.isNot(tok::header_name)) {
2077-
if (FilenameTok.is(tok::identifier) && PPOpts.SingleFileParseMode) {
2077+
if (FilenameTok.is(tok::identifier) &&
2078+
(PPOpts.SingleFileParseMode || PPOpts.SingleModuleParseMode)) {
20782079
// If we saw #include IDENTIFIER and lexing didn't turn in into a header
2079-
// name, it was undefined. In 'single-file-parse' mode, just skip the
2080-
// directive without emitting diagnostics - the identifier might be
2080+
// name, it was undefined. In 'single-{file,module}-parse' mode, just skip
2081+
// the directive without emitting diagnostics - the identifier might be
20812082
// normally defined in previously-skipped include directive.
20822083
DiscardUntilEndOfDirective();
20832084
return;
@@ -2385,10 +2386,15 @@ Preprocessor::ImportAction Preprocessor::HandleHeaderIncludeOrImport(
23852386
(getLangOpts().CPlusPlusModules || getLangOpts().Modules) &&
23862387
ModuleToImport && !ModuleToImport->isHeaderUnit();
23872388

2389+
if (MaybeTranslateInclude && (UsableHeaderUnit || UsableClangHeaderModule) &&
2390+
PPOpts.SingleModuleParseMode) {
2391+
Action = IncludeLimitReached;
2392+
}
23882393
// Determine whether we should try to import the module for this #include, if
23892394
// there is one. Don't do so if precompiled module support is disabled or we
23902395
// are processing this module textually (because we're building the module).
2391-
if (MaybeTranslateInclude && (UsableHeaderUnit || UsableClangHeaderModule)) {
2396+
else if (MaybeTranslateInclude &&
2397+
(UsableHeaderUnit || UsableClangHeaderModule)) {
23922398
// If this include corresponds to a module but that module is
23932399
// unavailable, diagnose the situation and bail out.
23942400
// FIXME: Remove this; loadModule does the same check (but produces
@@ -3440,6 +3446,13 @@ void Preprocessor::HandleIfdefDirective(Token &Result,
34403446
CurPPLexer->pushConditionalLevel(DirectiveTok.getLocation(),
34413447
/*wasskip*/false, /*foundnonskip*/false,
34423448
/*foundelse*/false);
3449+
} else if (PPOpts.SingleModuleParseMode && !MI) {
3450+
// In 'single-module-parse mode' undefined identifiers trigger skipping of
3451+
// all the directive blocks. We lie here and set FoundNonSkipPortion so that
3452+
// even any \#else blocks get skipped.
3453+
SkipExcludedConditionalBlock(
3454+
HashToken.getLocation(), DirectiveTok.getLocation(),
3455+
/*FoundNonSkipPortion=*/true, /*FoundElse=*/false);
34433456
} else if (!MI == isIfndef || RetainExcludedCB) {
34443457
// Yes, remember that we are inside a conditional, then lex the next token.
34453458
CurPPLexer->pushConditionalLevel(DirectiveTok.getLocation(),
@@ -3494,6 +3507,13 @@ void Preprocessor::HandleIfDirective(Token &IfToken,
34943507
// the directive blocks.
34953508
CurPPLexer->pushConditionalLevel(IfToken.getLocation(), /*wasskip*/false,
34963509
/*foundnonskip*/false, /*foundelse*/false);
3510+
} else if (PPOpts.SingleModuleParseMode && DER.IncludedUndefinedIds) {
3511+
// In 'single-module-parse mode' undefined identifiers trigger skipping of
3512+
// all the directive blocks. We lie here and set FoundNonSkipPortion so that
3513+
// even any \#else blocks get skipped.
3514+
SkipExcludedConditionalBlock(HashToken.getLocation(), IfToken.getLocation(),
3515+
/*FoundNonSkipPortion=*/true,
3516+
/*FoundElse=*/false);
34973517
} else if (ConditionalTrue || RetainExcludedCB) {
34983518
// Yes, remember that we are inside a conditional, then lex the next token.
34993519
CurPPLexer->pushConditionalLevel(IfToken.getLocation(), /*wasskip*/false,

‎clang/lib/Lex/PPExpressions.cpp‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -593,11 +593,13 @@ static bool EvaluateDirectiveSubExpr(PPValue &LHS, unsigned MinPrec,
593593
Token &PeekTok, bool ValueLive,
594594
bool &IncludedUndefinedIds,
595595
Preprocessor &PP) {
596-
if (PP.getPreprocessorOpts().SingleFileParseMode && IncludedUndefinedIds) {
597-
// The single-file parse mode behavior kicks in as soon as single identifier
598-
// is undefined. If we've already seen one, there's no point in continuing
599-
// with the rest of the expression. Besides saving work, this also prevents
600-
// calling undefined function-like macros.
596+
if ((PP.getPreprocessorOpts().SingleFileParseMode ||
597+
PP.getPreprocessorOpts().SingleModuleParseMode) &&
598+
IncludedUndefinedIds) {
599+
// The single-{file,module}-parse mode behavior kicks in as soon as single
600+
// identifier is undefined. If we've already seen one, there's no point in
601+
// continuing with the rest of the expression. Besides saving work, this
602+
// also prevents calling undefined function-like macros.
601603
PP.DiscardUntilEndOfDirective(PeekTok);
602604
return true;
603605
}

‎clang/test/Modules/single-module-parse-mode.c‎

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
// RUN: rm -rf %t
2+
// RUN: split-file %s %t
3+
4+
// RUN: %clang_cc1 -fmodules -fmodules-cache-path=%t/cache \
5+
// RUN: -emit-module %t/module.modulemap -fmodule-name=B -o %t/cache/B.pcm \
6+
// RUN: -fmodules-single-module-parse-mode 2>&1 | FileCheck %s
7+
8+
// Modules are not imported.
9+
// CHECK-NOT: A.h:1:2: error: unreachable
10+
11+
// Headers belonging to this module are included.
12+
// CHECK: B2.h:2:2: warning: success
13+
14+
// Non-modular headers are included.
15+
// CHECK: T.h:2:2: warning: success
16+
17+
// No branches are entered for #if UNDEFINED.
18+
// CHECK-NOT: B1.h:6:2: error: unreachable
19+
// CHECK-NOT: B1.h:8:2: error: unreachable
20+
// CHECK-NOT: B1.h:10:2: error: unreachable
21+
22+
// No branches are entered for #ifdef UNDEFINED.
23+
// CHECK-NOT: B1.h:14:2: error: unreachable
24+
// CHECK-NOT: B1.h:16:2: error: unreachable
25+
26+
// No branches are entered for #ifndef UNDEFINED.
27+
// CHECK-NOT: B1.h:20:2: error: unreachable
28+
// CHECK-NOT: B1.h:22:2: error: unreachable
29+
30+
// No error messages are emitted for UNDEFINED_FUNCTION_LIKE().
31+
// CHECK-NOT: B1.h:25:2: error: unreachable
32+
33+
// The correct branch is entered for #if DEFINED.
34+
// CHECK: B1.h:32:3: warning: success
35+
// CHECK-NOT: B1.h:34:3: error: unreachable
36+
// CHECK-NOT: B1.h:36:3: error: unreachable
37+
38+
// Headers belonging to this module are included.
39+
// CHECK: B2.h:2:2: warning: success
40+
41+
//--- module.modulemap
42+
module A { header "A.h" }
43+
module B {
44+
header "B1.h"
45+
header "B2.h"
46+
}
47+
//--- A.h
48+
#error unreachable
49+
//--- B1.h
50+
#include "A.h"
51+
#include "B2.h"
52+
#include "T.h"
53+
54+
#if UNDEFINED
55+
# error unreachable
56+
#elif UNDEFINED2
57+
# error unreachable
58+
#else
59+
# error unreachable
60+
#endif
61+
62+
#ifdef UNDEFINED
63+
# error unreachable
64+
#else
65+
# error unreachable
66+
#endif
67+
68+
#ifndef UNDEFINED
69+
# error unreachable
70+
#else
71+
# error unreachable
72+
#endif
73+
74+
#if UNDEFINED_FUNCTION_LIKE()
75+
#endif
76+
77+
#define DEFINED_1 1
78+
#define DEFINED_2 1
79+
80+
#if DEFINED_1
81+
# warning success
82+
#elif DEFINED_2
83+
# error unreachable
84+
#else
85+
# error unreachable
86+
#endif
87+
//--- B2.h
88+
// Headers belonging to this module are included.
89+
#warning success
90+
//--- T.h
91+
// Non-modular headers are included.
92+
#warning success

0 commit comments

Comments
 (0)