Merge pull request #1522 from kballard/conditional-compilation-overloads

[Parse] Don't error on overloads in a conditional compilation block
apple · Mar 14, 2016 · d251c7a · d251c7a
2 parents d525309 + a734063
commit d251c7a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/include/swift/Parse/Scope.h b/include/swift/Parse/Scope.h
@@ -78,7 +78,6 @@ enum class ScopeKind {
   CatchVars,
   WhileVars,
   IfVars,
-  ActiveConfigBlock,
 
   ClosureParams,
 };

diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp
@@ -2790,7 +2790,8 @@ ParserResult<IfConfigDecl> Parser::parseDeclIfConfig(ParseDeclOptions Flags) {
 
     Optional<Scope> scope;
     if (!ConfigState.isConditionActive())
-      scope.emplace(this, ScopeKind::Brace, /*inactiveConfigBlock=*/true);
+      scope.emplace(this, getScopeInfo().getCurrentScope()->getKind(),
+                    /*inactiveConfigBlock=*/true);
 
     SmallVector<Decl*, 8> Decls;
     if (ConfigState.shouldParse()) {

diff --git a/lib/Parse/Scope.cpp b/lib/Parse/Scope.cpp
@@ -38,7 +38,6 @@ static bool isResolvableScope(ScopeKind SK) {
   case ScopeKind::ConstructorBody:
   case ScopeKind::DestructorBody:
   case ScopeKind::Brace:
-  case ScopeKind::ActiveConfigBlock:
   case ScopeKind::ForVars:
   case ScopeKind::ForeachVars:
   case ScopeKind::ClosureParams:

diff --git a/test/Parse/ConditionalCompilation/basicDeclarations.swift b/test/Parse/ConditionalCompilation/basicDeclarations.swift
@@ -26,6 +26,11 @@ class D {
 		x = 1
 #endif
 	}
+
+#if !BAR
+    func overload(a: Int) {}
+    func overload(b: String) {} // should not result in an error
+#endif
 }
 
 var d = D()