Merge pull request #71751 from xedin/rdar-123244479

[ClangImporter] Produce `ErrorType` for invalid variables

Author: xedin

lib/AST/ASTVerifier.cpp

@@ -2654,6 +2654,11 @@ class Verifier : public ASTWalker {
       if (!var->hasInterfaceType())
         return;
 
+      // The types for imported vars are produced lazily and
+      // could fail to import.
+      if (var->getClangDecl() && var->isInvalid())
+        return;
+
       PrettyStackTraceDecl debugStack("verifying VarDecl", var);
 
       // Variables must have materializable type.

lib/ClangImporter/ClangImporter.cpp

@@ -6510,7 +6510,7 @@ Type ClangImporter::importVarDeclType(
                       getImportTypeAttrs(decl));
 
   if (!importedType)
-    return nullptr;
+    return ErrorType::get(Impl.SwiftContext);
 
   if (importedType.isImplicitlyUnwrapped())
     swiftDecl->setImplicitlyUnwrappedOptional(true);

test/ClangImporter/invalid_vars_should_have_error_type.swift

@@ -0,0 +1,22 @@
+// RUN: %empty-directory(%t/src)
+// RUN: split-file %s %t/src
+
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck %t/src/main.swift \
+// RUN:   -import-objc-header %t/src/Test.h \
+// RUN:   -module-name main -I %t -verify
+
+// REQUIRES: objc_interop
+
+//--- Test.h
+@import Foundation;
+
+extern const unsigned char TestDir[];
+
+extern NSString * _Nonnull __TestDir __attribute__((swift_name("TestDir")));
+
+//--- main.swift
+import Foundation
+
+func test() {
+  print(TestDir)
+}