averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[ClangImporter] Disable assertion from 4b0255d5 for now.

Browse Source 
We can still get into circular import cases that result in us trying
to import the members of a category before we've finished with the
members of the original class. I need to fix that, but for now disable
the assertion to unblock some Apple-internal bots.

rdar://problem/31374687
This commit is contained in:
Jordan Rose
2017-03-31 13:53:24 -07:00
parent ae6268155a
commit 19a2ad5f17
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/ClangImporter/ImportDecl.cpp
View File

@@ -4361,7 +4361,7 @@ namespace {
const DeclContext *overrideContext = overridden->getDeclContext();
// It's okay to compare interface types directly because Objective-C
// does not have constrained extensions.
if (overrideContext != dc && overridden->hasClangNode() &&
if (overrideContext != dc && overridden->hasClangNode() &&
overrideContext->getDeclaredInterfaceType()->isEqual(containerTy)) {
// We've encountered a redeclaration of the property.
// HACK: Just update the original declaration instead of importing a
@@ -7591,16 +7591,9 @@ ClangImporter::Implementation::loadAllMembers(Decl *D, uint64_t extra) {
const NominalTypeDecl *base = ext->getExtendedType()->getAnyNominal();
if (auto *clangBase = base->getClangDecl()) {
base->loadAllMembers();
// Sanity check: make sure we don't jump over to a category /while/
// loading the original class's members. Right now we only check if this
// happens on the first member.
if (auto *clangContainer = dyn_cast<clang::ObjCContainerDecl>(clangBase)){
if (!clangContainer->decls_empty()) {
assert(!base->getMembers().empty() &&
"can't load extension members before base has finished");
}
}
// FIXME: Assert that we don't jump over to a category /while/
// loading the original class's members. Unfortunately there are some
// cases where this does happen today.
}
}