HomePhabricator

Fix merge problem from clang r288295.
e9c940d506c3Unpublished

Authored by bob.wilson on Dec 6 2016, 5:28 PM.

Unpublished Commit ยท Learn More

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

Description

Fix merge problem from clang r288295.

John added the IsForDefinition argument to
CGObjCNonFragileABIMac::GetClassGlobal on trunk. This merged badly with
the Swift version of the code that previously had a boolean argument
named "ForDefinition". In the new version "ForDefinition" is an enum value
so this code did not fail to compile and only caused a test failure.
rdar://problem/29538073

apple-llvm-split-commit: 6c8b2c7e393fd136eacabbfa6b190953a73aa90e
apple-llvm-split-dir: clang/

Details

Committed
bob.wilsonDec 6 2016, 5:37 PM
Parents
rG3a8c570eedc8: Propagating prior merge from 'llvm.org/master'.
Branches
Unknown
Tags
Unknown