HomePhabricator

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

Authored by anemet on Mar 2 2018, 8:17 PM.

Unpublished Commit · Learn More

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

Description

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

Conflicts:
include/clang/Frontend/CompilerInstance.h

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

Merged Changes

CommitAuthorDetailsCommitted
886b4505f2d7D43995manojgupta
Do not generate calls to fentry with __attribute__((no_instrument_function)) 
Mar 2 2018