[llvm-branch-commits] [llvm-branch] r354555 - Merging r354497:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Thu Feb 21 00:57:12 2019
New Revision: 354555

URL: http://llvm.org/viewvc/llvm-project?rev=354555&view=rev
Log:
Merging r354497:
------------------------------------------------------------------------
r354497 | tstellar | 2019-02-20 19:43:45 +0100 (Wed, 20 Feb 2019) | 16 lines

AArch64/test: Add check for function name to machine-outliner-bad-adrp.mir

Summary:
This test was failing in one of our setups because the generated ModuleID
had the full path of the test file and that path contained the string
BL.

Reviewers: t.p.northover, jpaquette, paquette

Reviewed By: paquette

Subscribers: javed.absar, kristof.beyls, llvm-commits

Tags: #llvm

Differential Revision: https://reviews.llvm.org/D58217
------------------------------------------------------------------------

Modified:
    llvm/branches/release_80/   (props changed)
    llvm/branches/release_80/test/CodeGen/AArch64/machine-outliner-bad-adrp.mir

Propchange: llvm/branches/release_80/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 21 00:57:12 2019
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,351322,351325,351344-351345,351349,351351,351370,351381,351387,351421,351426,351436,351475,351485,351753-351754,351765,351910,351930,351932,352034,352204,352246,352374,352555,352607-352608,352707,352714,352770,352886,352889,352892,352895,352908,352917,352935,352945,353015,353061,353082,353138,353141,353155,353213,353218,353304,353308,353334,353367,353374,353383,353463,353480,353489,353551,353733,353758,353809,353907,354034,354117,354128,354131,354144
+/llvm/trunk:155241,351322,351325,351344-351345,351349,351351,351370,351381,351387,351421,351426,351436,351475,351485,351753-351754,351765,351910,351930,351932,352034,352204,352246,352374,352555,352607-352608,352707,352714,352770,352886,352889,352892,352895,352908,352917,352935,352945,353015,353061,353082,353138,353141,353155,353213,353218,353304,353308,353334,353367,353374,353383,353463,353480,353489,353551,353733,353758,353809,353907,354034,354117,354128,354131,354144,354497

Modified: llvm/branches/release_80/test/CodeGen/AArch64/machine-outliner-bad-adrp.mir
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_80/test/CodeGen/AArch64/machine-outliner-bad-adrp.mir?rev=354555&r1=354554&r2=354555&view=diff
==============================================================================
--- llvm/branches/release_80/test/CodeGen/AArch64/machine-outliner-bad-adrp.mir (original)
+++ llvm/branches/release_80/test/CodeGen/AArch64/machine-outliner-bad-adrp.mir Thu Feb 21 00:57:12 2019
@@ -10,6 +10,7 @@
 ...
 ---
 name:            foo
+# CHECK-LABEL: name: foo
 tracksRegLiveness: true
 constants:       
   - id:              0