[PATCH] D66982: [Modules][Objective-C] Use complete decl from module when diagnosing missing import

[Bruno Cardoso Lopes via Phabricator via cfe-commits]

bruno created this revision.
bruno added reviewers: rsmith, arphaman.
Herald added subscribers: cfe-commits, ributzka, dexonsmith, jkorous.
Herald added a project: clang.

Otherwise the definition (first found) for ObjCInterfaceDecl's might
precede the module one, which will eventually lead to crash, since
diagnoseMissingImport needs one coming from a module.

This behavior changed after Richard's r342018, which started to look
into the definition of ObjCInterfaceDecls.

rdar://problem/49237144


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D66982

Files:
  clang/lib/Sema/SemaLookup.cpp
  clang/test/Modules/Inputs/interface-diagnose-missing-import/Foo.framework/Headers/Bar.h
  clang/test/Modules/Inputs/interface-diagnose-missing-import/Foo.framework/Headers/Foo.h
  clang/test/Modules/Inputs/interface-diagnose-missing-import/Foo.framework/Modules/module.modulemap
  clang/test/Modules/Inputs/interface-diagnose-missing-import/Foo.framework/PrivateHeaders/RandoPriv.h
  clang/test/Modules/interface-diagnose-missing-import.m


Index: clang/test/Modules/interface-diagnose-missing-import.m
===================================================================
--- /dev/null
+++ clang/test/Modules/interface-diagnose-missing-import.m
@@ -0,0 +1,11 @@
+// RUN: rm -rf %t
+// RUN: %clang_cc1 %s -fsyntax-only -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -F%S/Inputs/interface-diagnose-missing-import -verify
+ at interface Buggy
+ at end
+
+ at import Foo.Bar;
+
+ at interface Buggy (MyExt) // expected-error {{definition of 'Buggy' must be imported from module 'Foo' before it is required}}
+ at end
+
+// expected-note at Foo/RandoPriv.h:3{{previous definition is here}}
Index: clang/test/Modules/Inputs/interface-diagnose-missing-import/Foo.framework/PrivateHeaders/RandoPriv.h
===================================================================
--- /dev/null
+++ clang/test/Modules/Inputs/interface-diagnose-missing-import/Foo.framework/PrivateHeaders/RandoPriv.h
@@ -0,0 +1,4 @@
+ at interface NSObject
+ at end
+ at interface Buggy : NSObject
+ at end
Index: clang/test/Modules/Inputs/interface-diagnose-missing-import/Foo.framework/Modules/module.modulemap
===================================================================
--- /dev/null
+++ clang/test/Modules/Inputs/interface-diagnose-missing-import/Foo.framework/Modules/module.modulemap
@@ -0,0 +1,6 @@
+// interface-diagnose-missing-import/Foo.framework/Modules/module.modulemap
+framework module Foo {
+  umbrella header "Foo.h"
+  export *
+  module * { export * }
+}
Index: clang/test/Modules/Inputs/interface-diagnose-missing-import/Foo.framework/Headers/Foo.h
===================================================================
--- /dev/null
+++ clang/test/Modules/Inputs/interface-diagnose-missing-import/Foo.framework/Headers/Foo.h
@@ -0,0 +1,2 @@
+#import <Foo/RandoPriv.h>
+#import <Foo/Bar.h>
Index: clang/test/Modules/Inputs/interface-diagnose-missing-import/Foo.framework/Headers/Bar.h
===================================================================
--- /dev/null
+++ clang/test/Modules/Inputs/interface-diagnose-missing-import/Foo.framework/Headers/Bar.h
@@ -0,0 +1 @@
+// interface-diagnose-missing-import/Foo.framework/Headers/Bar.h
Index: clang/lib/Sema/SemaLookup.cpp
===================================================================
--- clang/lib/Sema/SemaLookup.cpp
+++ clang/lib/Sema/SemaLookup.cpp
@@ -5256,8 +5256,11 @@
     return FD->getDefinition();
   if (TagDecl *TD = dyn_cast<TagDecl>(D))
     return TD->getDefinition();
+  // The first definition for this ObjCInterfaceDecl might be in the TU
+  // and not associated with any module. Use the one we know to be complete
+  // and have just seen in a module.
   if (ObjCInterfaceDecl *ID = dyn_cast<ObjCInterfaceDecl>(D))
-    return ID->getDefinition();
+    return ID;
   if (ObjCProtocolDecl *PD = dyn_cast<ObjCProtocolDecl>(D))
     return PD->getDefinition();
   if (TemplateDecl *TD = dyn_cast<TemplateDecl>(D))


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D66982.217999.patch
Type: text/x-patch
Size: 2917 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20190829/e98f6963/attachment.bin>