swiftlang · varungandhi-apple · Apr 28, 2020 · Apr 25, 2020
diff --git a/include/swift/AST/DiagnosticsSema.def b/include/swift/AST/DiagnosticsSema.def
@@ -795,19 +795,19 @@ ERROR(unspaced_unary_operator,none,
       "unary operators must not be juxtaposed; parenthesize inner expression",
       ())
 
-ERROR(use_unresolved_identifier,none,
-      "use of unresolved %select{identifier|operator}1 %0", (DeclNameRef, bool))
-ERROR(use_unresolved_identifier_corrected,none,
-      "use of unresolved %select{identifier|operator}1 %0; did you mean '%2'?",
+ERROR(cannot_find_in_scope,none,
+      "cannot %select{find|find operator}1 %0 in scope", (DeclNameRef, bool))
+ERROR(cannot_find_in_scope_corrected,none,
+      "cannot %select{find|find operator}1 %0 in scope; did you mean '%2'?",
       (DeclNameRef, bool, StringRef))
 NOTE(confusable_character,none,
       "%select{identifier|operator}0 '%1' contains possibly confused characters; "
       "did you mean to use '%2'?",
       (bool, StringRef, StringRef))
-ERROR(use_undeclared_type,none,
-      "use of undeclared type %0", (DeclNameRef))
-ERROR(use_undeclared_type_did_you_mean,none,
-      "use of undeclared type %0; did you mean to use '%1'?", (DeclNameRef, StringRef))
+ERROR(cannot_find_type_in_scope,none,
+      "cannot find type %0 in scope", (DeclNameRef))
+ERROR(cannot_find_type_in_scope_did_you_mean,none,
+      "cannot find type %0 in scope; did you mean to use '%1'?", (DeclNameRef, StringRef))
 NOTE(note_typo_candidate_implicit_member,none,
      "did you mean the implicitly-synthesized %1 '%0'?", (StringRef, StringRef))
 NOTE(note_remapped_type,none,
@@ -3666,9 +3666,9 @@ ERROR(continue_not_in_this_stmt,none,
       "'continue' cannot be used with %0 statements", (StringRef))
 
 ERROR(unresolved_label,none,
-      "use of unresolved label %0", (Identifier))
+      "cannot find label %0 in scope", (Identifier))
 ERROR(unresolved_label_corrected,none,
-      "use of unresolved label %0; did you mean %1?",
+      "cannot find label %0 in scope; did you mean %1?",
       (Identifier, Identifier))
 
 ERROR(foreach_sequence_does_not_conform_to_expected_protocol,none,

diff --git a/lib/Sema/PCMacro.cpp b/lib/Sema/PCMacro.cpp
@@ -575,7 +575,7 @@ class Instrumenter : InstrumenterBase {
         Context, BeforeLoggerRef, ArgsWithSourceRange, ArgLabels);
     Added<ApplyExpr *> AddedBeforeLogger(BeforeLoggerCall);
     if (!doTypeCheck(Context, TypeCheckDC, AddedBeforeLogger)) {
-      // typically due to 'use of unresolved identifier '__builtin_pc_before''
+      // typically due to 'cannot find '__builtin_pc_before' in scope'
       return E; // return E, it will be used in recovering from TC failure
     }
 
@@ -587,7 +587,7 @@ class Instrumenter : InstrumenterBase {
         Context, AfterLoggerRef, ArgsWithSourceRange, ArgLabels);
     Added<ApplyExpr *> AddedAfterLogger(AfterLoggerCall);
     if (!doTypeCheck(Context, TypeCheckDC, AddedAfterLogger)) {
-      // typically due to 'use of unresolved identifier '__builtin_pc_after''
+      // typically due to 'cannot find '__builtin_pc_after' in scope'
       return E; // return E, it will be used in recovering from TC failure
     }
 

diff --git a/lib/Sema/TypeCheckAttr.cpp b/lib/Sema/TypeCheckAttr.cpp
@@ -3673,7 +3673,7 @@ static AbstractFunctionDecl *findAbstractFunctionDecl(
 
   // Otherwise, emit the appropriate diagnostic and return nullptr.
   if (results.empty()) {
-    ctx.Diags.diagnose(funcNameLoc, diag::use_unresolved_identifier, funcName,
+    ctx.Diags.diagnose(funcNameLoc, diag::cannot_find_in_scope, funcName,
                        funcName.isOperator());
     return nullptr;
   }

diff --git a/lib/Sema/TypeCheckConstraints.cpp b/lib/Sema/TypeCheckConstraints.cpp
@@ -392,7 +392,7 @@ static bool diagnoseRangeOperatorMisspell(DiagnosticEngine &Diags,
 
   if (!corrected.empty()) {
     Diags
-        .diagnose(UDRE->getLoc(), diag::use_unresolved_identifier_corrected,
+        .diagnose(UDRE->getLoc(), diag::cannot_find_in_scope_corrected,
                   UDRE->getName(), true, corrected)
         .highlight(UDRE->getSourceRange())
         .fixItReplace(UDRE->getSourceRange(), corrected);
@@ -416,7 +416,7 @@ static bool diagnoseIncDecOperator(DiagnosticEngine &Diags,
 
   if (!corrected.empty()) {
     Diags
-        .diagnose(UDRE->getLoc(), diag::use_unresolved_identifier_corrected,
+        .diagnose(UDRE->getLoc(), diag::cannot_find_in_scope_corrected,
                   UDRE->getName(), true, corrected)
         .highlight(UDRE->getSourceRange());
 
@@ -537,7 +537,7 @@ Expr *TypeChecker::resolveDeclRefExpr(UnresolvedDeclRefExpr *UDRE,
 
     auto emitBasicError = [&] {
       Context.Diags
-          .diagnose(Loc, diag::use_unresolved_identifier, Name,
+          .diagnose(Loc, diag::cannot_find_in_scope, Name,
                     Name.isOperator())
           .highlight(UDRE->getSourceRange());
     };
@@ -561,7 +561,7 @@ Expr *TypeChecker::resolveDeclRefExpr(UnresolvedDeclRefExpr *UDRE,
 
       if (auto typo = corrections.claimUniqueCorrection()) {
         auto diag = Context.Diags.diagnose(
-            Loc, diag::use_unresolved_identifier_corrected, Name,
+            Loc, diag::cannot_find_in_scope_corrected, Name,
             Name.isOperator(), typo->CorrectedName.getBaseIdentifier().str());
         diag.highlight(UDRE->getSourceRange());
         typo->addFixits(diag);

diff --git a/lib/Sema/TypeCheckExprObjC.cpp b/lib/Sema/TypeCheckExprObjC.cpp
@@ -263,7 +263,7 @@ Optional<Type> TypeChecker::checkObjCKeyPathExpr(DeclContext *dc,
         diags.diagnose(componentNameLoc, diag::could_not_find_type_member,
                        currentType, componentName);
       else
-        diags.diagnose(componentNameLoc, diag::use_unresolved_identifier,
+        diags.diagnose(componentNameLoc, diag::cannot_find_in_scope,
                        componentName, false);
 
       // Note all the correction candidates.

diff --git a/lib/Sema/TypeCheckType.cpp b/lib/Sema/TypeCheckType.cpp
@@ -1138,7 +1138,7 @@ static Type diagnoseUnknownType(TypeResolution resolution,
     auto I = Remapped.find(TypeName);
     if (I != Remapped.end()) {
       auto RemappedTy = I->second->getString();
-      diags.diagnose(L, diag::use_undeclared_type_did_you_mean,
+      diags.diagnose(L, diag::cannot_find_type_in_scope_did_you_mean,
                      comp->getNameRef(), RemappedTy)
         .highlight(R)
         .fixItReplace(R, RemappedTy);
@@ -1155,7 +1155,7 @@ static Type diagnoseUnknownType(TypeResolution resolution,
       return I->second;
     }
 
-    diags.diagnose(L, diag::use_undeclared_type,
+    diags.diagnose(L, diag::cannot_find_type_in_scope,
                 comp->getNameRef())
       .highlight(R);
 
@@ -1651,7 +1651,7 @@ Type TypeChecker::resolveIdentifierType(
     if (!options.contains(TypeResolutionFlags::SilenceErrors)) {
       auto moduleName = moduleTy->getModule()->getName();
       diags.diagnose(Components.back()->getNameLoc(),
-                     diag::use_undeclared_type, DeclNameRef(moduleName));
+                     diag::cannot_find_type_in_scope, DeclNameRef(moduleName));
       diags.diagnose(Components.back()->getNameLoc(),
                      diag::note_module_as_type, moduleName);
     }

diff --git a/test/APINotes/versioned.swift b/test/APINotes/versioned.swift
@@ -158,7 +158,7 @@ func testRenamedUnknownEnum() {
 }
 
 func testRenamedTrueEnum() {
-  // CHECK-DIAGS: [[@LINE+1]]:7: error: use of unresolved identifier 'TrueEnumValue'
+  // CHECK-DIAGS: [[@LINE+1]]:7: error: cannot find 'TrueEnumValue' in scope
   _ = TrueEnumValue
 
   // CHECK-DIAGS: [[@LINE+1]]:16: error: type 'TrueEnum' has no member 'TrueEnumValue'
@@ -169,7 +169,7 @@ func testRenamedTrueEnum() {
 
   _ = TrueEnum.value // okay
 
-  // CHECK-DIAGS: [[@LINE+1]]:7: error: use of unresolved identifier 'TrueEnumRenamed'
+  // CHECK-DIAGS: [[@LINE+1]]:7: error: cannot find 'TrueEnumRenamed' in scope
   _ = TrueEnumRenamed
 
   // CHECK-DIAGS: [[@LINE+1]]:16: error: type 'TrueEnum' has no member 'TrueEnumRenamed'
@@ -190,7 +190,7 @@ func testRenamedTrueEnum() {
   _ = TrueEnum.renamedSwift4
   // CHECK-DIAGS-4-NOT: :[[@LINE-1]]:16:
 
-  // CHECK-DIAGS: [[@LINE+1]]:7: error: use of unresolved identifier 'TrueEnumAliasRenamed'
+  // CHECK-DIAGS: [[@LINE+1]]:7: error: cannot find 'TrueEnumAliasRenamed' in scope
   _ = TrueEnumAliasRenamed
 
   // CHECK-DIAGS: [[@LINE+1]]:16: error: type 'TrueEnum' has no member 'TrueEnumAliasRenamed'
@@ -213,7 +213,7 @@ func testRenamedTrueEnum() {
 }
 
 func testRenamedOptionyEnum() {
-  // CHECK-DIAGS: [[@LINE+1]]:7: error: use of unresolved identifier 'OptionyEnumValue'
+  // CHECK-DIAGS: [[@LINE+1]]:7: error: cannot find 'OptionyEnumValue' in scope
   _ = OptionyEnumValue
 
   // CHECK-DIAGS: [[@LINE+1]]:19: error: type 'OptionyEnum' has no member 'OptionyEnumValue'
@@ -224,7 +224,7 @@ func testRenamedOptionyEnum() {
 
   _ = OptionyEnum.value // okay
 
-  // CHECK-DIAGS: [[@LINE+1]]:7: error: use of unresolved identifier 'OptionyEnumRenamed'
+  // CHECK-DIAGS: [[@LINE+1]]:7: error: cannot find 'OptionyEnumRenamed' in scope
   _ = OptionyEnumRenamed
 
   // CHECK-DIAGS: [[@LINE+1]]:19: error: type 'OptionyEnum' has no member 'OptionyEnumRenamed'

diff --git a/test/AutoDiff/Sema/DerivedConformances/class_differentiable.swift b/test/AutoDiff/Sema/DerivedConformances/class_differentiable.swift
@@ -490,7 +490,7 @@ where T: Differentiable {}
 
 // TF-265: Test invalid initializer (that uses a non-existent type).
 class InvalidInitializer: Differentiable {
-  init(filterShape: (Int, Int, Int, Int), blah: NonExistentType) {}  // expected-error {{use of undeclared type 'NonExistentType'}}
+  init(filterShape: (Int, Int, Int, Int), blah: NonExistentType) {}  // expected-error {{cannot find type 'NonExistentType' in scope}}
 }
 
 // Test memberwise initializer synthesis.

diff --git a/test/AutoDiff/Sema/DerivedConformances/struct_differentiable.swift b/test/AutoDiff/Sema/DerivedConformances/struct_differentiable.swift
@@ -308,7 +308,7 @@ where T: Differentiable {}
 
 // TF-265: Test invalid initializer (that uses a non-existent type).
 struct InvalidInitializer: Differentiable {
-  init(filterShape: (Int, Int, Int, Int), blah: NonExistentType) {}  // expected-error {{use of undeclared type 'NonExistentType'}}
+  init(filterShape: (Int, Int, Int, Int), blah: NonExistentType) {}  // expected-error {{cannot find type 'NonExistentType' in scope}}
 }
 
 // Test memberwise initializer synthesis.

diff --git a/test/AutoDiff/Sema/derivative_attr_type_checking.swift b/test/AutoDiff/Sema/derivative_attr_type_checking.swift
@@ -70,15 +70,15 @@ func vjpSubtractWrt1(x: Float, y: Float) -> (value: Float, pullback: (Float) ->
 
 // Test invalid original function.
 
-// expected-error @+1 {{use of unresolved identifier 'nonexistentFunction'}}
+// expected-error @+1 {{cannot find 'nonexistentFunction' in scope}}
 @derivative(of: nonexistentFunction)
 func vjpOriginalFunctionNotFound(_ x: Float) -> (value: Float, pullback: (Float) -> Float) {
   fatalError()
 }
 
 // Test `@derivative` attribute where `value:` result does not conform to `Differentiable`.
 // Invalid original function should be diagnosed first.
-// expected-error @+1 {{use of unresolved identifier 'nonexistentFunction'}}
+// expected-error @+1 {{cannot find 'nonexistentFunction' in scope}}
 @derivative(of: nonexistentFunction)
 func vjpOriginalFunctionNotFound2(_ x: Float) -> (value: Int, pullback: (Float) -> Float) {
   fatalError()

diff --git a/test/AutoDiff/compiler_crashers_fixed/tf1167-differentiable-attr-override-match.swift b/test/AutoDiff/compiler_crashers_fixed/tf1167-differentiable-attr-override-match.swift
@@ -10,7 +10,7 @@
 
 public protocol Base {
   associatedtype Input
-  // expected-error @+1 {{use of undeclared type 'Differentiable'}}
+  // expected-error @+1 {{cannot find type 'Differentiable' in scope}}
   associatedtype Output: Differentiable
 
   // expected-error @+1 {{@differentiable attribute used without importing module '_Differentiation'}}

diff --git a/test/ClangImporter/CoreServices_test.swift b/test/ClangImporter/CoreServices_test.swift
@@ -7,10 +7,10 @@ import CoreServices
 func test(_ url: CFURL, ident: CSIdentity) {
   _ = CSBackupIsItemExcluded(url, nil) // okay
 
-  _ = nil as TypeThatDoesNotExist? // expected-error {{use of undeclared type 'TypeThatDoesNotExist'}}
+  _ = nil as TypeThatDoesNotExist? // expected-error {{cannot find type 'TypeThatDoesNotExist' in scope}}
   _ = nil as CoreServices.Collection? // okay
 
-  _ = kCollectionNoAttributes // expected-error{{use of unresolved identifier 'kCollectionNoAttributes'}}
+  _ = kCollectionNoAttributes // expected-error{{cannot find 'kCollectionNoAttributes' in scope}}
 
   var name: Unmanaged<CFString>?
   _ = LSCopyDisplayNameForURL(url, &name) as OSStatus // okay
@@ -22,6 +22,6 @@ func test(_ url: CFURL, ident: CSIdentity) {
   _ = CSIdentityCreateCopy(nil, ident) // okay
 
   var vers: UInt32 = 0
-  _ = KCGetKeychainManagerVersion(&vers) as OSStatus// expected-error{{use of unresolved identifier 'KCGetKeychainManagerVersion'}}
+  _ = KCGetKeychainManagerVersion(&vers) as OSStatus// expected-error{{cannot find 'KCGetKeychainManagerVersion' in scope}}
   _ = CoreServices.KCGetKeychainManagerVersion(&vers) as OSStatus// okay
 }
diff --git a/test/ClangImporter/Darwin_test.swift b/test/ClangImporter/Darwin_test.swift
@@ -5,7 +5,7 @@
 import Darwin
 import MachO
 
-_ = nil as Fract? // expected-error{{use of undeclared type 'Fract'}}
+_ = nil as Fract? // expected-error{{cannot find type 'Fract' in scope}}
 _ = nil as Darwin.Fract? // okay
 
 _ = 0 as OSErr
@@ -14,8 +14,8 @@ _ = 0 as UniChar
 
 _ = ProcessSerialNumber()
 
-_ = 0 as Byte // expected-error {{use of undeclared type 'Byte'}} {{10-14=UInt8}}
+_ = 0 as Byte // expected-error {{cannot find type 'Byte' in scope}} {{10-14=UInt8}}
 Darwin.fakeAPIUsingByteInDarwin() as Int // expected-error {{cannot convert value of type 'UInt8' to type 'Int' in coercion}}
 
-_ = FALSE // expected-error {{use of unresolved identifier 'FALSE'}}
+_ = FALSE // expected-error {{cannot find 'FALSE' in scope}}
 _ = DYLD_BOOL.FALSE
diff --git a/test/ClangImporter/MixedSource/Xcc_include.swift b/test/ClangImporter/MixedSource/Xcc_include.swift
@@ -6,18 +6,18 @@
 // CHECK-INCLUDE-MISSING: error: '{{.*}}this_header_does_not_exist.h' file not found
 
 func test() {
-  // CHECK-INCLUDE-ONLY: error: use of unresolved identifier 'includedConst'
-  // CHECK-INCLUDE-PLUS-BRIDGING-NOT: unresolved identifier 'includedConst'
-  // CHECK-INCLUDE-FRAMEWORK: error: use of unresolved identifier 'includedConst'
+  // CHECK-INCLUDE-ONLY: error: cannot find 'includedConst' in scope
+  // CHECK-INCLUDE-PLUS-BRIDGING-NOT: cannot find 'includedConst' in scope
+  // CHECK-INCLUDE-FRAMEWORK: error: cannot find 'includedConst' in scope
   _ = includedConst
 
-  // CHECK-INCLUDE-ONLY: error: use of unresolved identifier 'errSecSuccess'
-  // CHECK-INCLUDE-PLUS-BRIDGING: error: use of unresolved identifier 'errSecSuccess'
-  // CHECK-INCLUDE-FRAMEWORK: error: use of unresolved identifier 'errSecSuccess'
+  // CHECK-INCLUDE-ONLY: error: cannot find 'errSecSuccess' in scope
+  // CHECK-INCLUDE-PLUS-BRIDGING: error: cannot find 'errSecSuccess' in scope
+  // CHECK-INCLUDE-FRAMEWORK: error: cannot find 'errSecSuccess' in scope
   _ = errSecSuccess
 
 #if FRAMEWORK
-  // CHECK-INCLUDE-FRAMEWORK-NOT: error: unresolved identifier 'Base'
+  // CHECK-INCLUDE-FRAMEWORK-NOT: error: cannot find 'Base' in scope
   _ = Base()
 #endif
 }
diff --git a/test/ClangImporter/MixedSource/broken-bridging-header.swift b/test/ClangImporter/MixedSource/broken-bridging-header.swift
@@ -32,4 +32,4 @@ import HasBridgingHeader // expected-error {{failed to import bridging header}}
 // HEADER-ERROR: error: failed to import bridging header '{{.*}}/error-on-define.h'
 // HEADER-ERROR-NOT: error:
 
-let _ = x // expected-error {{use of unresolved identifier 'x'}}
+let _ = x // expected-error {{cannot find 'x' in scope}}
diff --git a/test/ClangImporter/MixedSource/broken-modules.swift b/test/ClangImporter/MixedSource/broken-modules.swift
@@ -37,4 +37,4 @@ import BrokenClangModule
 
 
 _ = BrokenClangModule.x
-// CHECK: broken-modules.swift:[[@LINE-1]]:5: error: use of unresolved identifier 'BrokenClangModule'
+// CHECK: broken-modules.swift:[[@LINE-1]]:5: error: cannot find 'BrokenClangModule' in scope
diff --git a/test/ClangImporter/MixedSource/can_import_objc_idempotent.swift b/test/ClangImporter/MixedSource/can_import_objc_idempotent.swift
@@ -18,21 +18,21 @@
 // current module.  Only an 'import Foo' statement should do this.
 
 #if canImport(AppKit)
-  class AppKitView : NSView {} // expected-error {{use of undeclared type 'NSView'}}
+  class AppKitView : NSView {} // expected-error {{cannot find type 'NSView' in scope}}
 #endif
 
 #if canImport(UIKit)
-  class UIKitView : UIView {} // expected-error {{use of undeclared type 'UIView'}}
+  class UIKitView : UIView {} // expected-error {{cannot find type 'UIView' in scope}}
 #endif
 
 #if canImport(CoreGraphics)
   let square = CGRect(x: 100, y: 100, width: 100, height: 100)
-  // expected-error@-1 {{use of unresolved identifier 'CGRect'}}
+  // expected-error@-1 {{cannot find 'CGRect' in scope}}
 
   let (r, s) = square.divided(atDistance: 50, from: .minXEdge)
 #endif
 
 #if canImport(MixedWithHeader)
-let object = NSObject() // expected-error {{use of unresolved identifier 'NSObject'}}
-let someAPI = Derived() // expected-error {{use of unresolved identifier 'Derived'}}
+let object = NSObject() // expected-error {{cannot find 'NSObject' in scope}}
+let someAPI = Derived() // expected-error {{cannot find 'Derived' in scope}}
 #endif
diff --git a/test/ClangImporter/MixedSource/mixed-target-using-header.swift b/test/ClangImporter/MixedSource/mixed-target-using-header.swift
@@ -48,7 +48,7 @@ func testStruct(_ p: Point2D) -> Point2D {
 
 #if !SILGEN
 func testSuppressed() {
-  let _: __int128_t? = nil // expected-error{{use of undeclared type '__int128_t'}}
+  let _: __int128_t? = nil // expected-error{{cannot find type '__int128_t' in scope}}
 }
 #endif
 

diff --git a/test/ClangImporter/attr-swift_name_renaming.swift b/test/ClangImporter/attr-swift_name_renaming.swift
@@ -20,7 +20,7 @@ func test() {
 
   // Typedef-of-anonymous-type-name renaming
   var p = Point()
-  var p2 = PointType() // FIXME: should provide Fix-It expected-error{{use of unresolved identifier 'PointType'}} {{none}}
+  var p2 = PointType() // FIXME: should provide Fix-It expected-error{{cannot find 'PointType' in scope}} {{none}}
 
   // Field name remapping
   p.x = 7

diff --git a/test/ClangImporter/attr-swift_private.swift b/test/ClangImporter/attr-swift_private.swift
@@ -94,9 +94,9 @@ public func testTopLevel() {
   _ = __PrivS1()
 
 #if !IRGEN
-  let _ = PrivFooSub() // expected-error {{use of unresolved identifier}}
-  privTest() // expected-error {{use of unresolved identifier}}
-  PrivS1() // expected-error {{use of unresolved identifier}}
+  let _ = PrivFooSub() // expected-error {{cannot find 'PrivFooSub' in scope}}
+  privTest() // expected-error {{cannot find 'privTest' in scope}}
+  PrivS1() // expected-error {{cannot find 'PrivS1' in scope}}
 #endif
 }
 

diff --git a/test/ClangImporter/bad-ns-extensible-string-enum.swift b/test/ClangImporter/bad-ns-extensible-string-enum.swift
@@ -1,3 +1,3 @@
 // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck %s -enable-objc-interop -import-objc-header %S/Inputs/bad-ns-extensible-string-enum.h -verify
 
-let string = MyString.MyStringOne // expected-error {{use of unresolved identifier 'MyString'}}
+let string = MyString.MyStringOne // expected-error {{cannot find 'MyString' in scope}}
diff --git a/test/ClangImporter/ctypes_parse.swift b/test/ClangImporter/ctypes_parse.swift
@@ -113,7 +113,7 @@ func testFuncStructDisambiguation() {
 }
 
 func testVoid() {
-  var x: MyVoid // expected-error{{use of undeclared type 'MyVoid'}}
+  var x: MyVoid // expected-error{{cannot find type 'MyVoid' in scope}}
   returnsMyVoid()
 }
 

diff --git a/test/ClangImporter/ctypes_parse_objc.swift b/test/ClangImporter/ctypes_parse_objc.swift
@@ -84,7 +84,7 @@ func testImportCFTypes() {
 }
 
 func testImportSEL() {
-  var t1 : SEL // expected-error {{use of undeclared type 'SEL'}} {{12-15=Selector}}
+  var t1 : SEL // expected-error {{cannot find type 'SEL' in scope}} {{12-15=Selector}}
   var t2 : ctypes.SEL // expected-error {{no type named 'SEL' in module 'ctypes'}}
 }
 

diff --git a/test/ClangImporter/enum-objc.swift b/test/ClangImporter/enum-objc.swift
@@ -21,8 +21,8 @@ let _: Int = forwardWithUnderlyingPointer // expected-error {{cannot convert val
 let _: Int = forwardObjCPointer // expected-error {{cannot convert value of type '(OpaquePointer) -> Void' to specified type 'Int'}}
 
 // FIXME: It would be nice to import these as unavailable somehow instead.
-let _: Int = forwardWithUnderlyingValue // expected-error {{use of unresolved identifier 'forwardWithUnderlyingValue'}}
-let _: Int = forwardObjCValue // expected-error {{use of unresolved identifier 'forwardObjCValue'}}
+let _: Int = forwardWithUnderlyingValue // expected-error {{cannot find 'forwardWithUnderlyingValue' in scope}}
+let _: Int = forwardObjCValue // expected-error {{cannot find 'forwardObjCValue' in scope}}
 
 // Note that if /these/ start getting imported as unavailable, the error will
 // also mention that there's a missing argument, since the second argument isn't
Original file line number	Diff line number	Diff line change
Expand Up		@@ -37,4 +37,4 @@ import BrokenClangModule


		_ = BrokenClangModule.x
		// CHECK: broken-modules.swift:[[@LINE-1]]:5: error: use of unresolved identifier 'BrokenClangModule'
		// CHECK: broken-modules.swift:[[@LINE-1]]:5: error: cannot find 'BrokenClangModule' in scope