HomePhabricator

Fix incorrect merge conflict resolution

Authored by anemet on Feb 28 2018, 11:32 PM.

Description

Fix incorrect merge conflict resolution

In our version, I don't think we can remove the dyn_cast so just restore the
version prior to the merge.

apple-llvm-split-commit: 3fd281b9b64a394f07432b059e6d55cc94325eb8
apple-llvm-split-dir: clang/

Details

Committed
anemetFeb 28 2018, 11:32 PM
Parents
rGef0f24b95685: Merge remote-tracking branch 'llvm.org/master' into upstream-with-swift
Branches
Unknown
Tags
Unknown