[llvm-branch-commits] [llvm-branch] r310316 - Merging r310240:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Mon Aug  7 15:11:20 2017
New Revision: 310316

URL: http://llvm.org/viewvc/llvm-project?rev=310316&view=rev
Log:
Merging r310240:
------------------------------------------------------------------------
r310240 | vitalybuka | 2017-08-07 00:12:33 -0700 (Mon, 07 Aug 2017) | 1 line

Add -asan-force-dynamic-shadow test
------------------------------------------------------------------------

Added:
    llvm/branches/release_50/test/Instrumentation/AddressSanitizer/force-dynamic-shadow.ll
      - copied unchanged from r310240, llvm/trunk/test/Instrumentation/AddressSanitizer/force-dynamic-shadow.ll
Modified:
    llvm/branches/release_50/   (props changed)

Propchange: llvm/branches/release_50/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug  7 15:11:20 2017
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,308483-308484,308503,308808,308813,308891,308906,308950,308963,308978,308986,309113,309302,309321,309323,309325,309330,309343,309353,309355,309422,309481,309483,309495,309555,309561,309594,309651,309744,309849,309928,309930,310071,310190,310241-310242
+/llvm/trunk:155241,308483-308484,308503,308808,308813,308891,308906,308950,308963,308978,308986,309113,309302,309321,309323,309325,309330,309343,309353,309355,309422,309481,309483,309495,309555,309561,309594,309651,309744,309849,309928,309930,310071,310190,310240-310242