[llvm-branch-commits] [llvm-branch] r323523 - Merging r323384:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Fri Jan 26 04:03:01 2018
New Revision: 323523

URL: http://llvm.org/viewvc/llvm-project?rev=323523&view=rev
Log:
Merging r323384:
------------------------------------------------------------------------
r323384 | aemerson | 2018-01-24 23:40:25 +0100 (Wed, 24 Jan 2018) | 1 line

[GlobalISel] Add a requires: asserts to a test.
------------------------------------------------------------------------

Modified:
    llvm/branches/release_60/   (props changed)
    llvm/branches/release_60/test/CodeGen/AArch64/GlobalISel/fallback-nofastisel.ll

Propchange: llvm/branches/release_60/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 26 04:03:01 2018
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,321751,321789,321791,321806,321862,321870,321872,321878,321980,321991,321993-321994,322003,322053,322056,322103,322106,322223,322272,322313,322372,322473,322623,322644,322724,322767,322875,322878-322879,322900,322904-322905,322973,322993,323034,323190,323307,323369,323371
+/llvm/trunk:155241,321751,321789,321791,321806,321862,321870,321872,321878,321980,321991,321993-321994,322003,322053,322056,322103,322106,322223,322272,322313,322372,322473,322623,322644,322724,322767,322875,322878-322879,322900,322904-322905,322973,322993,323034,323190,323307,323369,323371,323384

Modified: llvm/branches/release_60/test/CodeGen/AArch64/GlobalISel/fallback-nofastisel.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_60/test/CodeGen/AArch64/GlobalISel/fallback-nofastisel.ll?rev=323523&r1=323522&r2=323523&view=diff
==============================================================================
--- llvm/branches/release_60/test/CodeGen/AArch64/GlobalISel/fallback-nofastisel.ll (original)
+++ llvm/branches/release_60/test/CodeGen/AArch64/GlobalISel/fallback-nofastisel.ll Fri Jan 26 04:03:01 2018
@@ -1,4 +1,5 @@
 ; RUN: llc -mtriple=aarch64_be-- %s -o /dev/null -debug-only=isel -O0 2>&1 | FileCheck %s
+; REQUIRES: asserts
 
 ; This test uses big endian in order to force an abort since it's not currently supported for GISel.
 ; The purpose is to check that we don't fall back to FastISel. Checking the pass structure is insufficient