averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add frontend flag -warn-if-astscope-lookup w/ test

Browse Source
This commit is contained in:
David Ungar
2019-08-06 23:17:49 -07:00
parent 369e31e463
commit 09342dfa47
5 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/swift/Basic/LangOptions.h
View File

@@ -261,9 +261,13 @@ namespace swift {
/// Someday, ASTScopeLookup will supplant lookup in the parser
bool DisableParserLookup = false;
/// Sound we compare to ASTScope-based resolution for debugging?
/// Should we compare to ASTScope-based resolution for debugging?
bool CompareToASTScopeLookup = false;
/// Since some tests fail if the warning is output, use a flag to decide
/// whether it is. The warning is useful for testing.
bool WarnIfASTScopeLookup = false;
/// Whether to use the import as member inference system
///
/// When importing a global, try to infer whether we can import it as a

3
include/swift/Option/FrontendOptions.td
View File

@@ -125,6 +125,9 @@ def disable_target_os_checking :
def compare_to_astscope_lookup : Flag<["-"], "compare-to-astscope-lookup">,
HelpText<"Compare legacy to ASTScope-based unqualified name lookup (for debugging)">;
def warn_if_astscope_lookup : Flag<["-"], "warn-if-astscope-lookup">,
HelpText<"Print a warning if ASTScope lookup is used">;
def print_clang_stats : Flag<["-"], "print-clang-stats">,
HelpText<"Print Clang importer statistics">;

2
lib/AST/UnqualifiedLookup.cpp
View File

@@ -486,7 +486,7 @@ void UnqualifiedLookupFactory::performUnqualifiedLookup() {
const bool compareToASTScopes = Ctx.LangOpts.CompareToASTScopeLookup;
if (useASTScopesForExperimentalLookup() && !compareToASTScopes) {
static bool haveWarned = false;
if (!haveWarned) {
if (!haveWarned && Ctx.LangOpts.WarnIfASTScopeLookup) {
haveWarned = true;
llvm::errs() << "WARNING: TRYING Scope exclusively\n";
}

1
lib/Frontend/CompilerInvocation.cpp
View File

@@ -338,6 +338,7 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
options::OPT_disable_astscope_lookup, Opts.EnableASTScopeLookup) ||
Opts.DisableParserLookup;
Opts.CompareToASTScopeLookup |= Args.hasArg(OPT_compare_to_astscope_lookup);
Opts.WarnIfASTScopeLookup |= Args.hasArg(OPT_warn_if_astscope_lookup);
Opts.DebugConstraintSolver |= Args.hasArg(OPT_debug_constraints);
Opts.NamedLazyMemberLoading &= !Args.hasArg(OPT_disable_named_lazy_member_loading);

13
test/NameBinding/warn-if-astscope.swift Normal file
View File

@@ -0,0 +1,13 @@
// Verify the action of -warn-if-astscope-lookup
//
// RUN: not %target-swift-frontend -typecheck %s -enable-astscope-lookup 2>&1 | %FileCheck %s --check-prefix=CHECK-NO-WARN
// RUN: not %target-swift-frontend -typecheck %s -disable-astscope-lookup 2>&1 | %FileCheck %s --check-prefix=CHECK-NO-WARN
// RUN: not %target-swift-frontend -typecheck %s -enable-astscope-lookup -warn-if-astscope-lookup 2>&1 | %FileCheck %s --check-prefix=CHECK-WARN
// RUN: not %target-swift-frontend -typecheck %s -disable-astscope-lookup -warn-if-astscope-lookup 2>&1 | %FileCheck %s --check-prefix=CHECK-NO-WARN
func foo() -> Int {
return bar() // create an error so the input to fileCheck isn't empty
}
// CHECK-NO-WARN-NOT: WARNING: TRYING Scope exclusively
// CHECK-WARN: WARNING: TRYING Scope exclusively