HomePhabricator

[upstream-with-swift] Fix bad merge in 4bee7c556e
12e0322fdcebUnpublished

Authored by bob.wilson on Jun 15 2018, 11:12 PM.

Unpublished Commit · Learn More

Not On Permanent Ref: This commit is not an ancestor of any permanent ref.

Description

[upstream-with-swift] Fix bad merge in 4bee7c556e

The “generalized_swift_name” feature was inadvertently dropped when
resolving a merge conflict. rdar://problem/40779573

apple-llvm-split-commit: a110f67fb25be94908676dff05fe8f0d3b588836
apple-llvm-split-dir: clang/

Details

Committed
bob.wilsonJun 15 2018, 11:12 PM
Parents
rG97d99aecb5f0: Propagating prior merge from 'llvm.org/master'.
Branches
Unknown
Tags
Unknown