forked from OSchip/llvm-project
Fix up indentation and fix an 80 column violation.
llvm-svn: 208164
This commit is contained in:
parent
8ae1203992
commit
dcfc60ff41
clang/lib/AST
|
@ -3697,27 +3697,28 @@ Decl *ASTNodeImporter::VisitObjCImplementationDecl(ObjCImplementationDecl *D) {
|
||||||
// Verify that the existing @implementation has the same superclass.
|
// Verify that the existing @implementation has the same superclass.
|
||||||
if ((Super && !Impl->getSuperClass()) ||
|
if ((Super && !Impl->getSuperClass()) ||
|
||||||
(!Super && Impl->getSuperClass()) ||
|
(!Super && Impl->getSuperClass()) ||
|
||||||
(Super && Impl->getSuperClass() &&
|
(Super && Impl->getSuperClass() &&
|
||||||
!declaresSameEntity(Super->getCanonicalDecl(), Impl->getSuperClass()))) {
|
!declaresSameEntity(Super->getCanonicalDecl(),
|
||||||
Importer.ToDiag(Impl->getLocation(),
|
Impl->getSuperClass()))) {
|
||||||
diag::err_odr_objc_superclass_inconsistent)
|
Importer.ToDiag(Impl->getLocation(),
|
||||||
<< Iface->getDeclName();
|
diag::err_odr_objc_superclass_inconsistent)
|
||||||
// FIXME: It would be nice to have the location of the superclass
|
<< Iface->getDeclName();
|
||||||
// below.
|
// FIXME: It would be nice to have the location of the superclass
|
||||||
if (Impl->getSuperClass())
|
// below.
|
||||||
Importer.ToDiag(Impl->getLocation(),
|
if (Impl->getSuperClass())
|
||||||
|
Importer.ToDiag(Impl->getLocation(),
|
||||||
|
diag::note_odr_objc_superclass)
|
||||||
|
<< Impl->getSuperClass()->getDeclName();
|
||||||
|
else
|
||||||
|
Importer.ToDiag(Impl->getLocation(),
|
||||||
|
diag::note_odr_objc_missing_superclass);
|
||||||
|
if (D->getSuperClass())
|
||||||
|
Importer.FromDiag(D->getLocation(),
|
||||||
diag::note_odr_objc_superclass)
|
diag::note_odr_objc_superclass)
|
||||||
<< Impl->getSuperClass()->getDeclName();
|
<< D->getSuperClass()->getDeclName();
|
||||||
else
|
else
|
||||||
Importer.ToDiag(Impl->getLocation(),
|
Importer.FromDiag(D->getLocation(),
|
||||||
diag::note_odr_objc_missing_superclass);
|
diag::note_odr_objc_missing_superclass);
|
||||||
if (D->getSuperClass())
|
|
||||||
Importer.FromDiag(D->getLocation(),
|
|
||||||
diag::note_odr_objc_superclass)
|
|
||||||
<< D->getSuperClass()->getDeclName();
|
|
||||||
else
|
|
||||||
Importer.FromDiag(D->getLocation(),
|
|
||||||
diag::note_odr_objc_missing_superclass);
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue