diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2016-02-19 22:25:36 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2016-02-19 22:25:36 +0000 |
| commit | 7e82e019c6bc974e8819c66fbc386e25dd6ea64a (patch) | |
| tree | 10f4986d0392cba8f3130a33a35218e38273ff47 /clang/lib/Sema/SemaDeclObjC.cpp | |
| parent | a8f1f2efaff0f2de6a7158c33ba714b31ecea19d (diff) | |
| download | bcm5719-llvm-7e82e019c6bc974e8819c66fbc386e25dd6ea64a.tar.gz bcm5719-llvm-7e82e019c6bc974e8819c66fbc386e25dd6ea64a.zip | |
[modules] Flatten -fmodule-name= and -fmodule-implementation-of= into a single
option. Previously these options could both be used to specify that you were
compiling the implementation file of a module, with a different set of minor
bugs in each case.
This change removes -fmodule-implementation-of, and instead tracks a flag to
determine whether we're currently building a module. -fmodule-name now behaves
the same way that -fmodule-implementation-of previously did.
llvm-svn: 261372
Diffstat (limited to 'clang/lib/Sema/SemaDeclObjC.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaDeclObjC.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaDeclObjC.cpp b/clang/lib/Sema/SemaDeclObjC.cpp index 89d99906a07..6121973eb18 100644 --- a/clang/lib/Sema/SemaDeclObjC.cpp +++ b/clang/lib/Sema/SemaDeclObjC.cpp @@ -3171,7 +3171,7 @@ void Sema::addMethodToGlobalList(ObjCMethodList *List, ObjCMethodList *Previous = List; for (; List; Previous = List, List = List->getNext()) { // If we are building a module, keep all of the methods. - if (getLangOpts().Modules && !getLangOpts().CurrentModule.empty()) + if (getLangOpts().CompilingModule) continue; if (!MatchTwoMethodDeclarations(Method, List->getMethod())) { |
