HomePhabricator

Merge remote-tracking branch 'llvm.org/master' into 'upstream-with-swift'

Authored by jkorous on Dec 6 2018, 1:33 AM.

Description

Merge remote-tracking branch 'llvm.org/master' into 'upstream-with-swift'

  1. Conflicts:
  2. include/clang/Basic/Attr.td

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

Merged Changes

CommitAuthorDetailsCommitted
fe8231ecca4a stephenkelly
Add test for ObjC generics 
Dec 6 2018
d6518a89e096 stephenkelly
Extend OMP test 
Dec 6 2018
59c4ada8ab65 stephenkelly
Make test resistant to line numbers changing 
Dec 6 2018
b3be390f94caD45314grimar
[ELF] - (-Map file) Implement printing of LMA for assignments outside of… 
Dec 6 2018