[llvm-branch-commits] [llvm-branch] r368678 - Merging r368478:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Tue Aug 13 05:08:26 2019
New Revision: 368678

URL: http://llvm.org/viewvc/llvm-project?rev=368678&view=rev
Log:
Merging r368478:
------------------------------------------------------------------------
r368478 | void | 2019-08-09 22:18:30 +0200 (Fri, 09 Aug 2019) | 16 lines

[CodeGen] Require a name for a block addr target

Summary:
A block address may be used in inline assembly. In which case it
requires a name so that the asm parser has something to parse. Creating
a name for every block address is a large hammer, but is necessary
because at the point when a temp symbol is created we don't necessarily
know if it's used in inline asm. This ensures that it exists regardless.

Reviewers: nickdesaulniers, craig.topper

Subscribers: nathanchance, javed.absar, llvm-commits

Tags: #llvm

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

Added:
    llvm/branches/release_90/test/CodeGen/AArch64/callbr-asm-obj-file.ll
      - copied unchanged from r368478, llvm/trunk/test/CodeGen/AArch64/callbr-asm-obj-file.ll
    llvm/branches/release_90/test/CodeGen/X86/callbr-asm-obj-file.ll
      - copied unchanged from r368478, llvm/trunk/test/CodeGen/X86/callbr-asm-obj-file.ll
Modified:
    llvm/branches/release_90/   (props changed)
    llvm/branches/release_90/lib/CodeGen/MachineModuleInfo.cpp

Propchange: llvm/branches/release_90/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 13 05:08:26 2019
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,366431,366481,366487,366527,366570,366660,366868,366925,367030,367062,367124,367215,367292,367304,367306,367314,367340-367341,367394,367396,367398,367403,367417,367662,367750,367753,367846-367847,367898,367941,368004,368230,368315,368324,368477,368517-368519,368554,368572
+/llvm/trunk:155241,366431,366481,366487,366527,366570,366660,366868,366925,367030,367062,367124,367215,367292,367304,367306,367314,367340-367341,367394,367396,367398,367403,367417,367662,367750,367753,367846-367847,367898,367941,368004,368230,368315,368324,368477-368478,368517-368519,368554,368572

Modified: llvm/branches/release_90/lib/CodeGen/MachineModuleInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_90/lib/CodeGen/MachineModuleInfo.cpp?rev=368678&r1=368677&r2=368678&view=diff
==============================================================================
--- llvm/branches/release_90/lib/CodeGen/MachineModuleInfo.cpp (original)
+++ llvm/branches/release_90/lib/CodeGen/MachineModuleInfo.cpp Tue Aug 13 05:08:26 2019
@@ -121,7 +121,7 @@ ArrayRef<MCSymbol *> MMIAddrLabelMap::ge
   BBCallbacks.back().setMap(this);
   Entry.Index = BBCallbacks.size() - 1;
   Entry.Fn = BB->getParent();
-  Entry.Symbols.push_back(Context.createTempSymbol());
+  Entry.Symbols.push_back(Context.createTempSymbol(!BB->hasAddressTaken()));
   return Entry.Symbols;
 }