[llvm-branch-commits] [llvm-branch] r371043 - Merging r370753:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Thu Sep  5 02:54:36 2019
New Revision: 371043

URL: http://llvm.org/viewvc/llvm-project?rev=371043&view=rev
Log:
Merging r370753:
------------------------------------------------------------------------
r370753 | jonpa | 2019-09-03 15:31:22 +0200 (Tue, 03 Sep 2019) | 6 lines

[SystemZ]  Recognize INLINEASM_BR in backend.

SystemZInstrInfo::analyzeBranch() needs to check for INLINEASM_BR
instructions, or it will crash.

Review: Ulrich Weigand
------------------------------------------------------------------------

Added:
    llvm/branches/release_90/test/CodeGen/SystemZ/asm-20.ll
      - copied unchanged from r370753, llvm/trunk/test/CodeGen/SystemZ/asm-20.ll
Modified:
    llvm/branches/release_90/   (props changed)
    llvm/branches/release_90/lib/Target/SystemZ/SystemZInstrInfo.cpp

Propchange: llvm/branches/release_90/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep  5 02:54:36 2019
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,366431,366447,366481,366487,366527,366570,366660,366868,366925,367019,367030,367062,367084,367124,367215,367292,367304,367306,367314,367340-367341,367394,367396,367398,367403,367412,367417,367429,367580,367662,367750,367753,367846-367847,367898,367941,368004,368164,368230,368300,368315,368324,368477-368478,368517-368519,368554,368572,368873,369011,369026,369084,369095,369097,369168,369199,369310,369426,369443,369886,370036,370176,370204,370271,370355,370404
+/llvm/trunk:155241,366431,366447,366481,366487,366527,366570,366660,366868,366925,367019,367030,367062,367084,367124,367215,367292,367304,367306,367314,367340-367341,367394,367396,367398,367403,367412,367417,367429,367580,367662,367750,367753,367846-367847,367898,367941,368004,368164,368230,368300,368315,368324,368477-368478,368517-368519,368554,368572,368873,369011,369026,369084,369095,369097,369168,369199,369310,369426,369443,369886,370036,370176,370204,370271,370355,370404,370753

Modified: llvm/branches/release_90/lib/Target/SystemZ/SystemZInstrInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_90/lib/Target/SystemZ/SystemZInstrInfo.cpp?rev=371043&r1=371042&r2=371043&view=diff
==============================================================================
--- llvm/branches/release_90/lib/Target/SystemZ/SystemZInstrInfo.cpp (original)
+++ llvm/branches/release_90/lib/Target/SystemZ/SystemZInstrInfo.cpp Thu Sep  5 02:54:36 2019
@@ -462,8 +462,8 @@ bool SystemZInstrInfo::analyzeBranch(Mac
       break;
 
     // A terminator that isn't a branch can't easily be handled by this
-    // analysis.
-    if (!I->isBranch())
+    // analysis.  Asm goto is not understood / optimized.
+    if (!I->isBranch() || I->getOpcode() == SystemZ::INLINEASM_BR)
       return true;
 
     // Can't handle indirect branches.