Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2025-05-28 17:06:37 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

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

Browse Source 
Summary:
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

Reviewers: rsmith, arphaman

Subscribers: jkorous, dexonsmith, ributzka, cfe-commits

Tags: #clang

Differential Revision: https://reviews.llvm.org/D66982

llvm-svn: 372039
This commit is contained in:
Bruno Cardoso Lopes 2019-09-16 22:00:29 +00:00
parent 155a43edb0
commit 919fc50034
6 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clang/lib/Sema/SemaLookup.cpp
View File

@ -5273,8 +5273,11 @@ static NamedDecl *getDefinitionToImport(NamedDecl *D) {
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))

1
clang/test/Modules/Inputs/interface-diagnose-missing-import/Foo.framework/Headers/Bar.h Normal file
View File

@ -0,0 +1 @@
// interface-diagnose-missing-import/Foo.framework/Headers/Bar.h

2
clang/test/Modules/Inputs/interface-diagnose-missing-import/Foo.framework/Headers/Foo.h Normal file
View File

@ -0,0 +1,2 @@
#import <Foo/RandoPriv.h>
#import <Foo/Bar.h>

6
clang/test/Modules/Inputs/interface-diagnose-missing-import/Foo.framework/Modules/module.modulemap Normal file
View File

@ -0,0 +1,6 @@
// interface-diagnose-missing-import/Foo.framework/Modules/module.modulemap
framework module Foo {
umbrella header "Foo.h"
export *
module * { export * }
}

4
clang/test/Modules/Inputs/interface-diagnose-missing-import/Foo.framework/PrivateHeaders/RandoPriv.h Normal file
View File

@ -0,0 +1,4 @@
@interface NSObject
@end
@interface Buggy : NSObject
@end

11
clang/test/Modules/interface-diagnose-missing-import.m Normal file
View File

@ -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
@interface Buggy
@end
@import Foo.Bar;
@interface Buggy (MyExt) // expected-error {{definition of 'Buggy' must be imported from module 'Foo' before it is required}}
@end
// expected-note@Foo/RandoPriv.h:3{{previous definition is here}}