Rename Dictionary downcast entry points to include "Conditional".

s/_dictionaryCheckedDownCast/_dictionaryDownCastConditional/g
s/_dictionaryBridgeFromObjectiveC/_dictionaryBridgeFromObjectiveCConditional/g


Swift SVN r18931
This commit is contained in:
Doug Gregor
2014-06-16 15:35:18 +00:00
parent c19b92e4b3
commit 2ccbcccc0a
6 changed files with 40 additions and 34 deletions

View File

@@ -998,8 +998,9 @@ RValue RValueEmitter::visitCollectionDowncastExpr(CollectionDowncastExpr *E,
? ctx.getArrayBridgeFromObjectiveCConditional(nullptr)
: ctx.getArrayDownCastConditional(nullptr);
} else if (fromCollection->getDecl() == ctx.getDictionaryDecl()) {
fn = E->bridgesFromObjC() ? ctx.getDictionaryBridgeFromObjectiveC(nullptr)
: ctx.getDictionaryDownCast(nullptr);
fn = E->bridgesFromObjC()
? ctx.getDictionaryBridgeFromObjectiveCConditional(nullptr)
: ctx.getDictionaryDownCastConditional(nullptr);
} else {
llvm_unreachable("unsupported collection upcast kind");
}