<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Wed, May 13, 2015 at 1:58 AM, Sergey Dmitrouk <span dir="ltr"><<a href="mailto:sdmitrouk@accesssoftek.com" target="_blank">sdmitrouk@accesssoftek.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">Author: sdmitrouk<br>
Date: Wed May 13 03:58:03 2015<br>
New Revision: 237237<br>
<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject-3Frev-3D237237-26view-3Drev&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=jgg6iFMuQCLVChVm_m_fuGdoujDRQbrgWsoqlMFK_kg&s=HLDchi6wkXHXW4tMpXFBcnd0tlt6yOk_uMfgAC0rh7Y&e=" target="_blank">http://llvm.org/viewvc/llvm-project?rev=237237&view=rev</a><br>
Log:<br>
[DebugInfo] Debug locations for constant SD nodes<br>
<br>
Several updates for [DebugInfo] Add debug locations to constant SD nodes (r235989).<br>
Includes:<br>
<br>
* re-enabling the change (disabled recently);<br>
* missing change for FP constants;<br>
* resetting debug location of constant node if it's used more than at one place<br>
to prevent emission of wrong locations in case of coalesced constants;<br>
* a couple of additional tests.<br>
<br>
Now all look ups in CSEMap are wrapped by additional method.<br>
<br>
Comment in D9084 suggests that debug locations aren't useful for "target constants",<br>
so there might be one more change related to this API (namely, dropping debug<br>
locations for getTarget*Constant methods).<br></blockquote><div><br>This still seems to have some oddities that are increasing the size of -gmlt in particular by creating discontiguous instruction ranges for inlined subroutines in ways that are possibly incorrect-ish.<br><br>Take this example:</div><div><br><div>volatile int x;</div><div>int y;</div><div>static __attribute__((always_inline)) int f1() {</div><div> if (x * 3 < 14) return 1;</div><div> return 2;</div><div>}</div><div>int main() {</div><div> x = f1();</div><div> x = x ? 1 : 2;</div><div>}</div><br>& the assembly difference: <a href="https://urldefense.proofpoint.com/v2/url?u=https-3A__www.diffchecker.com_p2ladh2w&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=jgg6iFMuQCLVChVm_m_fuGdoujDRQbrgWsoqlMFK_kg&s=HxvE4DvvCa5tkElDTc_-JA-AAswXH88zAmyywvVsky8&e=">https://www.diffchecker.com/p2ladh2w</a><br><br><span style="font-family:Arial,Helvetica,sans-serif;font-size:13px">What happens is that the 1 stored to x from the inlined f1() ends up being emitted indirectly (in this particular instance - setg/movzbl/incl so if the condition is false it's 1 + 1 and if it's true it's 0 + 1) so when the 1 is needed in main it's emitted directly there, but still attributed to the location inside f1.<br></span><br>Does this still qualify as two uses of the constant '1' & should not get locations? Or does that first indirect emission not count as a use at this level - yet we somehow still use that use's location for the other use... ?</div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
<br>
Differential Revision: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__reviews.llvm.org_D9604&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=jgg6iFMuQCLVChVm_m_fuGdoujDRQbrgWsoqlMFK_kg&s=xUZZ1s3OOkWVFbI6L0340q3_eldjS6mkQbAQcJDx-ug&e=" target="_blank">http://reviews.llvm.org/D9604</a><br>
<br>
Added:<br>
llvm/trunk/test/DebugInfo/ARM/multiple-constant-uses-drops-dbgloc.ll<br>
llvm/trunk/test/DebugInfo/ARM/single-constant-use-preserves-dbgloc.ll<br>
llvm/trunk/test/DebugInfo/constantfp-sdnodes-have-dbg-location.ll<br>
Modified:<br>
llvm/trunk/include/llvm/CodeGen/SelectionDAG.h<br>
llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h<br>
llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp<br>
llvm/trunk/test/DebugInfo/AArch64/constant-dbgloc.ll<br>
llvm/trunk/test/DebugInfo/ARM/constant-dbgloc.ll<br>
llvm/trunk/test/DebugInfo/constant-sdnodes-have-dbg-location.ll<br>
<br>
Modified: llvm/trunk/include/llvm/CodeGen/SelectionDAG.h<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_llvm_trunk_include_llvm_CodeGen_SelectionDAG.h-3Frev-3D237237-26r1-3D237236-26r2-3D237237-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=jgg6iFMuQCLVChVm_m_fuGdoujDRQbrgWsoqlMFK_kg&s=mN5wEap8r6PORf6rgc3hul4xHXvkRpWt0eSlEoHAJ-4&e=" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/SelectionDAG.h?rev=237237&r1=237236&r2=237237&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/CodeGen/SelectionDAG.h (original)<br>
+++ llvm/trunk/include/llvm/CodeGen/SelectionDAG.h Wed May 13 03:58:03 2015<br>
@@ -1243,6 +1243,18 @@ private:<br>
SDValue N1, SDValue N2,<br>
const SDNodeFlags *Flags = nullptr);<br>
<br>
+ /// Look up the node specified by ID in CSEMap. If it exists, return it. If<br>
+ /// not, return the insertion token that will make insertion faster. This<br>
+ /// overload is for nodes other than Constant or ConstantFP, use the other one<br>
+ /// for those.<br>
+ SDNode *FindNodeOrInsertPos(const FoldingSetNodeID &ID, void *&InsertPos);<br>
+<br>
+ /// Look up the node specified by ID in CSEMap. If it exists, return it. If<br>
+ /// not, return the insertion token that will make insertion faster. Performs<br>
+ /// additional processing for constant nodes.<br>
+ SDNode *FindNodeOrInsertPos(const FoldingSetNodeID &ID, DebugLoc DL,<br>
+ void *&InsertPos);<br>
+<br>
/// List of non-single value types.<br>
FoldingSet<SDVTListNode> VTListMap;<br>
<br>
<br>
Modified: llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_llvm_trunk_include_llvm_CodeGen_SelectionDAGNodes.h-3Frev-3D237237-26r1-3D237236-26r2-3D237237-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=jgg6iFMuQCLVChVm_m_fuGdoujDRQbrgWsoqlMFK_kg&s=QMy-37vOQpsvL4DTx9hfRy0X8wfBQYeENVPn19fbN68&e=" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h?rev=237237&r1=237236&r2=237237&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h (original)<br>
+++ llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h Wed May 13 03:58:03 2015<br>
@@ -1406,11 +1406,10 @@ public:<br>
class ConstantSDNode : public SDNode {<br>
const ConstantInt *Value;<br>
friend class SelectionDAG;<br>
- // XXX: DebugLoc is unused intentionally until constant coalescing is resolved<br>
ConstantSDNode(bool isTarget, bool isOpaque, const ConstantInt *val,<br>
- DebugLoc, EVT VT)<br>
+ DebugLoc DL, EVT VT)<br>
: SDNode(isTarget ? ISD::TargetConstant : ISD::Constant,<br>
- 0, DebugLoc(), getSDVTList(VT)), Value(val) {<br>
+ 0, DL, getSDVTList(VT)), Value(val) {<br>
SubclassData |= (uint16_t)isOpaque;<br>
}<br>
public:<br>
@@ -1435,9 +1434,9 @@ public:<br>
class ConstantFPSDNode : public SDNode {<br>
const ConstantFP *Value;<br>
friend class SelectionDAG;<br>
- ConstantFPSDNode(bool isTarget, const ConstantFP *val, EVT VT)<br>
+ ConstantFPSDNode(bool isTarget, const ConstantFP *val, DebugLoc DL, EVT VT)<br>
: SDNode(isTarget ? ISD::TargetConstantFP : ISD::ConstantFP,<br>
- 0, DebugLoc(), getSDVTList(VT)), Value(val) {<br>
+ 0, DL, getSDVTList(VT)), Value(val) {<br>
}<br>
public:<br>
<br>
<br>
Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_llvm_trunk_lib_CodeGen_SelectionDAG_SelectionDAG.cpp-3Frev-3D237237-26r1-3D237236-26r2-3D237237-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=jgg6iFMuQCLVChVm_m_fuGdoujDRQbrgWsoqlMFK_kg&s=wA_4QmrPuhO2zD4X6iZXgDyZlvbj54DwAMzCjoQ5sio&e=" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp?rev=237237&r1=237236&r2=237237&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp (original)<br>
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp Wed May 13 03:58:03 2015<br>
@@ -868,7 +868,7 @@ SDNode *SelectionDAG::FindModifiedNodeSl<br>
FoldingSetNodeID ID;<br>
AddNodeIDNode(ID, N->getOpcode(), N->getVTList(), Ops);<br>
AddNodeIDCustom(ID, N);<br>
- SDNode *Node = CSEMap.FindNodeOrInsertPos(ID, InsertPos);<br>
+ SDNode *Node = FindNodeOrInsertPos(ID, N->getDebugLoc(), InsertPos);<br>
return Node;<br>
}<br>
<br>
@@ -886,7 +886,7 @@ SDNode *SelectionDAG::FindModifiedNodeSl<br>
FoldingSetNodeID ID;<br>
AddNodeIDNode(ID, N->getOpcode(), N->getVTList(), Ops);<br>
AddNodeIDCustom(ID, N);<br>
- SDNode *Node = CSEMap.FindNodeOrInsertPos(ID, InsertPos);<br>
+ SDNode *Node = FindNodeOrInsertPos(ID, N->getDebugLoc(), InsertPos);<br>
return Node;<br>
}<br>
<br>
@@ -903,7 +903,7 @@ SDNode *SelectionDAG::FindModifiedNodeSl<br>
FoldingSetNodeID ID;<br>
AddNodeIDNode(ID, N->getOpcode(), N->getVTList(), Ops);<br>
AddNodeIDCustom(ID, N);<br>
- SDNode *Node = CSEMap.FindNodeOrInsertPos(ID, InsertPos);<br>
+ SDNode *Node = FindNodeOrInsertPos(ID, N->getDebugLoc(), InsertPos);<br>
return Node;<br>
}<br>
<br>
@@ -969,6 +969,40 @@ BinarySDNode *SelectionDAG::GetBinarySDN<br>
return N;<br>
}<br>
<br>
+SDNode *SelectionDAG::FindNodeOrInsertPos(const FoldingSetNodeID &ID,<br>
+ void *&InsertPos) {<br>
+ SDNode *N = CSEMap.FindNodeOrInsertPos(ID, InsertPos);<br>
+ if (N) {<br>
+ switch (N->getOpcode()) {<br>
+ default: break;<br>
+ case ISD::Constant:<br>
+ case ISD::ConstantFP:<br>
+ llvm_unreachable("Querying for Constant and ConstantFP nodes requires "<br>
+ "debug location. Use another overload.");<br>
+ }<br>
+ }<br>
+ return N;<br>
+}<br>
+<br>
+SDNode *SelectionDAG::FindNodeOrInsertPos(const FoldingSetNodeID &ID,<br>
+ DebugLoc DL, void *&InsertPos) {<br>
+ SDNode *N = CSEMap.FindNodeOrInsertPos(ID, InsertPos);<br>
+ if (N) {<br>
+ switch (N->getOpcode()) {<br>
+ default: break; // Process only regular (non-target) constant nodes.<br>
+ case ISD::Constant:<br>
+ case ISD::ConstantFP:<br>
+ // Erase debug location from the node if the node is used at several<br>
+ // different places to do not propagate one location to all uses as it<br>
+ // leads to incorrect debug info.<br>
+ if (N->getDebugLoc() != DL)<br>
+ N->setDebugLoc(DebugLoc());<br>
+ break;<br>
+ }<br>
+ }<br>
+ return N;<br>
+}<br>
+<br>
void SelectionDAG::clear() {<br>
allnodes_clear();<br>
OperandAllocator.Reset();<br>
@@ -1172,7 +1206,7 @@ SDValue SelectionDAG::getConstant(const<br>
ID.AddBoolean(isO);<br>
void *IP = nullptr;<br>
SDNode *N = nullptr;<br>
- if ((N = CSEMap.FindNodeOrInsertPos(ID, IP)))<br>
+ if ((N = FindNodeOrInsertPos(ID, DL.getDebugLoc(), IP)))<br>
if (!VT.isVector())<br>
return SDValue(N, 0);<br>
<br>
@@ -1216,12 +1250,13 @@ SDValue SelectionDAG::getConstantFP(cons<br>
ID.AddPointer(&V);<br>
void *IP = nullptr;<br>
SDNode *N = nullptr;<br>
- if ((N = CSEMap.FindNodeOrInsertPos(ID, IP)))<br>
+ if ((N = FindNodeOrInsertPos(ID, DL.getDebugLoc(), IP)))<br>
if (!VT.isVector())<br>
return SDValue(N, 0);<br>
<br>
if (!N) {<br>
- N = new (NodeAllocator) ConstantFPSDNode(isTarget, &V, EltVT);<br>
+ N = new (NodeAllocator) ConstantFPSDNode(isTarget, &V, DL.getDebugLoc(),<br>
+ EltVT);<br>
CSEMap.InsertNode(N, IP);<br>
InsertNode(N);<br>
}<br>
@@ -1278,7 +1313,7 @@ SDValue SelectionDAG::getGlobalAddress(c<br>
ID.AddInteger(TargetFlags);<br>
ID.AddInteger(GV->getType()->getAddressSpace());<br>
void *IP = nullptr;<br>
- if (SDNode *E = CSEMap.FindNodeOrInsertPos(ID, IP))<br>
+ if (SDNode *E = FindNodeOrInsertPos(ID, DL.getDebugLoc(), IP))<br>
return SDValue(E, 0);<br>
<br>
SDNode *N = new (NodeAllocator) GlobalAddressSDNode(Opc, DL.getIROrder(),<br>
@@ -1295,7 +1330,7 @@ SDValue SelectionDAG::getFrameIndex(int<br>
AddNodeIDNode(ID, Opc, getVTList(VT), None);<br>
ID.AddInteger(FI);<br>
void *IP = nullptr;<br>
- if (SDNode *E = CSEMap.FindNodeOrInsertPos(ID, IP))<br>
+ if (SDNode *E = FindNodeOrInsertPos(ID, IP))<br>
return SDValue(E, 0);<br>
<br>
SDNode *N = new (NodeAllocator) FrameIndexSDNode(FI, VT, isTarget);<br>
@@ -1314,7 +1349,7 @@ SDValue SelectionDAG::getJumpTable(int J<br>
ID.AddInteger(JTI);<br>
ID.AddInteger(TargetFlags);<br>
void *IP = nullptr;<br>
- if (SDNode *E = CSEMap.FindNodeOrInsertPos(ID, IP))<br>
+ if (SDNode *E = FindNodeOrInsertPos(ID, IP))<br>
return SDValue(E, 0);<br>
<br>
SDNode *N = new (NodeAllocator) JumpTableSDNode(JTI, VT, isTarget,<br>
@@ -1340,7 +1375,7 @@ SDValue SelectionDAG::getConstantPool(co<br>
ID.AddPointer(C);<br>
ID.AddInteger(TargetFlags);<br>
void *IP = nullptr;<br>
- if (SDNode *E = CSEMap.FindNodeOrInsertPos(ID, IP))<br>
+ if (SDNode *E = FindNodeOrInsertPos(ID, IP))<br>
return SDValue(E, 0);<br>
<br>
SDNode *N = new (NodeAllocator) ConstantPoolSDNode(isTarget, C, VT, Offset,<br>
@@ -1367,7 +1402,7 @@ SDValue SelectionDAG::getConstantPool(Ma<br>
C->addSelectionDAGCSEId(ID);<br>
ID.AddInteger(TargetFlags);<br>
void *IP = nullptr;<br>
- if (SDNode *E = CSEMap.FindNodeOrInsertPos(ID, IP))<br>
+ if (SDNode *E = FindNodeOrInsertPos(ID, IP))<br>
return SDValue(E, 0);<br>
<br>
SDNode *N = new (NodeAllocator) ConstantPoolSDNode(isTarget, C, VT, Offset,<br>
@@ -1385,7 +1420,7 @@ SDValue SelectionDAG::getTargetIndex(int<br>
ID.AddInteger(Offset);<br>
ID.AddInteger(TargetFlags);<br>
void *IP = nullptr;<br>
- if (SDNode *E = CSEMap.FindNodeOrInsertPos(ID, IP))<br>
+ if (SDNode *E = FindNodeOrInsertPos(ID, IP))<br>
return SDValue(E, 0);<br>
<br>
SDNode *N = new (NodeAllocator) TargetIndexSDNode(Index, VT, Offset,<br>
@@ -1400,7 +1435,7 @@ SDValue SelectionDAG::getBasicBlock(Mach<br>
AddNodeIDNode(ID, ISD::BasicBlock, getVTList(MVT::Other), None);<br>
ID.AddPointer(MBB);<br>
void *IP = nullptr;<br>
- if (SDNode *E = CSEMap.FindNodeOrInsertPos(ID, IP))<br>
+ if (SDNode *E = FindNodeOrInsertPos(ID, IP))<br>
return SDValue(E, 0);<br>
<br>
SDNode *N = new (NodeAllocator) BasicBlockSDNode(MBB);<br>
@@ -1613,7 +1648,7 @@ SDValue SelectionDAG::getVectorShuffle(E<br>
ID.AddInteger(MaskVec[i]);<br>
<br>
void* IP = nullptr;<br>
- if (SDNode *E = CSEMap.FindNodeOrInsertPos(ID, IP))<br>
+ if (SDNode *E = FindNodeOrInsertPos(ID, dl.getDebugLoc(), IP))<br>
return SDValue(E, 0);<br>
<br>
// Allocate the mask array for the node out of the BumpPtrAllocator, since<br>
@@ -1655,7 +1690,7 @@ SDValue SelectionDAG::getConvertRndSat(E<br>
SDValue Ops[] = { Val, DTy, STy, Rnd, Sat };<br>
AddNodeIDNode(ID, ISD::CONVERT_RNDSAT, getVTList(VT), Ops);<br>
void* IP = nullptr;<br>
- if (SDNode *E = CSEMap.FindNodeOrInsertPos(ID, IP))<br>
+ if (SDNode *E = FindNodeOrInsertPos(ID, dl.getDebugLoc(), IP))<br>
return SDValue(E, 0);<br>
<br>
CvtRndSatSDNode *N = new (NodeAllocator) CvtRndSatSDNode(VT, dl.getIROrder(),<br>
@@ -1671,7 +1706,7 @@ SDValue SelectionDAG::getRegister(unsign<br>
AddNodeIDNode(ID, ISD::Register, getVTList(VT), None);<br>
ID.AddInteger(RegNo);<br>
void *IP = nullptr;<br>
- if (SDNode *E = CSEMap.FindNodeOrInsertPos(ID, IP))<br>
+ if (SDNode *E = FindNodeOrInsertPos(ID, IP))<br>
return SDValue(E, 0);<br>
<br>
SDNode *N = new (NodeAllocator) RegisterSDNode(RegNo, VT);<br>
@@ -1685,7 +1720,7 @@ SDValue SelectionDAG::getRegisterMask(co<br>
AddNodeIDNode(ID, ISD::RegisterMask, getVTList(MVT::Untyped), None);<br>
ID.AddPointer(RegMask);<br>
void *IP = nullptr;<br>
- if (SDNode *E = CSEMap.FindNodeOrInsertPos(ID, IP))<br>
+ if (SDNode *E = FindNodeOrInsertPos(ID, IP))<br>
return SDValue(E, 0);<br>
<br>
SDNode *N = new (NodeAllocator) RegisterMaskSDNode(RegMask);<br>
@@ -1700,7 +1735,7 @@ SDValue SelectionDAG::getEHLabel(SDLoc d<br>
AddNodeIDNode(ID, ISD::EH_LABEL, getVTList(MVT::Other), Ops);<br>
ID.AddPointer(Label);<br>
void *IP = nullptr;<br>
- if (SDNode *E = CSEMap.FindNodeOrInsertPos(ID, IP))<br>
+ if (SDNode *E = FindNodeOrInsertPos(ID, IP))<br>
return SDValue(E, 0);<br>
<br>
SDNode *N = new (NodeAllocator) EHLabelSDNode(dl.getIROrder(),<br>
@@ -1723,7 +1758,7 @@ SDValue SelectionDAG::getBlockAddress(co<br>
ID.AddInteger(Offset);<br>
ID.AddInteger(TargetFlags);<br>
void *IP = nullptr;<br>
- if (SDNode *E = CSEMap.FindNodeOrInsertPos(ID, IP))<br>
+ if (SDNode *E = FindNodeOrInsertPos(ID, IP))<br>
return SDValue(E, 0);<br>
<br>
SDNode *N = new (NodeAllocator) BlockAddressSDNode(Opc, VT, BA, Offset,<br>
@@ -1742,7 +1777,7 @@ SDValue SelectionDAG::getSrcValue(const<br>
ID.AddPointer(V);<br>
<br>
void *IP = nullptr;<br>
- if (SDNode *E = CSEMap.FindNodeOrInsertPos(ID, IP))<br>
+ if (SDNode *E = FindNodeOrInsertPos(ID, IP))<br>
return SDValue(E, 0);<br>
<br>
SDNode *N = new (NodeAllocator) SrcValueSDNode(V);<br>
@@ -1758,7 +1793,7 @@ SDValue SelectionDAG::getMDNode(const MD<br>
ID.AddPointer(MD);<br>
<br>
void *IP = nullptr;<br>
- if (SDNode *E = CSEMap.FindNodeOrInsertPos(ID, IP))<br>
+ if (SDNode *E = FindNodeOrInsertPos(ID, IP))<br>
return SDValue(E, 0);<br>
<br>
SDNode *N = new (NodeAllocator) MDNodeSDNode(MD);<br>
@@ -1777,7 +1812,7 @@ SDValue SelectionDAG::getAddrSpaceCast(S<br>
ID.AddInteger(DestAS);<br>
<br>
void *IP = nullptr;<br>
- if (SDNode *E = CSEMap.FindNodeOrInsertPos(ID, IP))<br>
+ if (SDNode *E = FindNodeOrInsertPos(ID, dl.getDebugLoc(), IP))<br>
return SDValue(E, 0);<br>
<br>
SDNode *N = new (NodeAllocator) AddrSpaceCastSDNode(dl.getIROrder(),<br>
@@ -2717,7 +2752,7 @@ SDValue SelectionDAG::getNode(unsigned O<br>
FoldingSetNodeID ID;<br>
AddNodeIDNode(ID, Opcode, getVTList(VT), None);<br>
void *IP = nullptr;<br>
- if (SDNode *E = CSEMap.FindNodeOrInsertPos(ID, IP))<br>
+ if (SDNode *E = FindNodeOrInsertPos(ID, DL.getDebugLoc(), IP))<br>
return SDValue(E, 0);<br>
<br>
SDNode *N = new (NodeAllocator) SDNode(Opcode, DL.getIROrder(),<br>
@@ -3052,7 +3087,7 @@ SDValue SelectionDAG::getNode(unsigned O<br>
SDValue Ops[1] = { Operand };<br>
AddNodeIDNode(ID, Opcode, VTs, Ops);<br>
void *IP = nullptr;<br>
- if (SDNode *E = CSEMap.FindNodeOrInsertPos(ID, IP))<br>
+ if (SDNode *E = FindNodeOrInsertPos(ID, DL.getDebugLoc(), IP))<br>
return SDValue(E, 0);<br>
<br>
N = new (NodeAllocator) UnarySDNode(Opcode, DL.getIROrder(),<br>
@@ -3664,7 +3699,7 @@ SDValue SelectionDAG::getNode(unsigned O<br>
AddNodeIDNode(ID, Opcode, VTs, Ops);<br>
AddNodeIDFlags(ID, Opcode, Flags);<br>
void *IP = nullptr;<br>
- if (SDNode *E = CSEMap.FindNodeOrInsertPos(ID, IP))<br>
+ if (SDNode *E = FindNodeOrInsertPos(ID, DL.getDebugLoc(), IP))<br>
return SDValue(E, 0);<br>
<br>
N = GetBinarySDNode(Opcode, DL, VTs, N1, N2, Flags);<br>
@@ -3767,7 +3802,7 @@ SDValue SelectionDAG::getNode(unsigned O<br>
FoldingSetNodeID ID;<br>
AddNodeIDNode(ID, Opcode, VTs, Ops);<br>
void *IP = nullptr;<br>
- if (SDNode *E = CSEMap.FindNodeOrInsertPos(ID, IP))<br>
+ if (SDNode *E = FindNodeOrInsertPos(ID, DL.getDebugLoc(), IP))<br>
return SDValue(E, 0);<br>
<br>
N = new (NodeAllocator) TernarySDNode(Opcode, DL.getIROrder(),<br>
@@ -4525,7 +4560,7 @@ SDValue SelectionDAG::getAtomic(unsigned<br>
AddNodeIDNode(ID, Opcode, VTList, Ops);<br>
ID.AddInteger(MMO->getPointerInfo().getAddrSpace());<br>
void* IP = nullptr;<br>
- if (SDNode *E = CSEMap.FindNodeOrInsertPos(ID, IP)) {<br>
+ if (SDNode *E = FindNodeOrInsertPos(ID, dl.getDebugLoc(), IP)) {<br>
cast<AtomicSDNode>(E)->refineAlignment(MMO);<br>
return SDValue(E, 0);<br>
}<br>
@@ -4730,7 +4765,7 @@ SelectionDAG::getMemIntrinsicNode(unsign<br>
AddNodeIDNode(ID, Opcode, VTList, Ops);<br>
ID.AddInteger(MMO->getPointerInfo().getAddrSpace());<br>
void *IP = nullptr;<br>
- if (SDNode *E = CSEMap.FindNodeOrInsertPos(ID, IP)) {<br>
+ if (SDNode *E = FindNodeOrInsertPos(ID, dl.getDebugLoc(), IP)) {<br>
cast<MemIntrinsicSDNode>(E)->refineAlignment(MMO);<br>
return SDValue(E, 0);<br>
}<br>
@@ -4852,7 +4887,7 @@ SelectionDAG::getLoad(ISD::MemIndexedMod<br>
MMO->isInvariant()));<br>
ID.AddInteger(MMO->getPointerInfo().getAddrSpace());<br>
void *IP = nullptr;<br>
- if (SDNode *E = CSEMap.FindNodeOrInsertPos(ID, IP)) {<br>
+ if (SDNode *E = FindNodeOrInsertPos(ID, dl.getDebugLoc(), IP)) {<br>
cast<LoadSDNode>(E)->refineAlignment(MMO);<br>
return SDValue(E, 0);<br>
}<br>
@@ -4960,7 +4995,7 @@ SDValue SelectionDAG::getStore(SDValue C<br>
MMO->isNonTemporal(), MMO->isInvariant()));<br>
ID.AddInteger(MMO->getPointerInfo().getAddrSpace());<br>
void *IP = nullptr;<br>
- if (SDNode *E = CSEMap.FindNodeOrInsertPos(ID, IP)) {<br>
+ if (SDNode *E = FindNodeOrInsertPos(ID, dl.getDebugLoc(), IP)) {<br>
cast<StoreSDNode>(E)->refineAlignment(MMO);<br>
return SDValue(E, 0);<br>
}<br>
@@ -5029,7 +5064,7 @@ SDValue SelectionDAG::getTruncStore(SDVa<br>
MMO->isNonTemporal(), MMO->isInvariant()));<br>
ID.AddInteger(MMO->getPointerInfo().getAddrSpace());<br>
void *IP = nullptr;<br>
- if (SDNode *E = CSEMap.FindNodeOrInsertPos(ID, IP)) {<br>
+ if (SDNode *E = FindNodeOrInsertPos(ID, dl.getDebugLoc(), IP)) {<br>
cast<StoreSDNode>(E)->refineAlignment(MMO);<br>
return SDValue(E, 0);<br>
}<br>
@@ -5055,7 +5090,7 @@ SelectionDAG::getIndexedStore(SDValue Or<br>
ID.AddInteger(ST->getRawSubclassData());<br>
ID.AddInteger(ST->getPointerInfo().getAddrSpace());<br>
void *IP = nullptr;<br>
- if (SDNode *E = CSEMap.FindNodeOrInsertPos(ID, IP))<br>
+ if (SDNode *E = FindNodeOrInsertPos(ID, dl.getDebugLoc(), IP))<br>
return SDValue(E, 0);<br>
<br>
SDNode *N = new (NodeAllocator) StoreSDNode(Ops, dl.getIROrder(),<br>
@@ -5084,7 +5119,7 @@ SelectionDAG::getMaskedLoad(EVT VT, SDLo<br>
MMO->isInvariant()));<br>
ID.AddInteger(MMO->getPointerInfo().getAddrSpace());<br>
void *IP = nullptr;<br>
- if (SDNode *E = CSEMap.FindNodeOrInsertPos(ID, IP)) {<br>
+ if (SDNode *E = FindNodeOrInsertPos(ID, dl.getDebugLoc(), IP)) {<br>
cast<MaskedLoadSDNode>(E)->refineAlignment(MMO);<br>
return SDValue(E, 0);<br>
}<br>
@@ -5111,7 +5146,7 @@ SDValue SelectionDAG::getMaskedStore(SDV<br>
MMO->isNonTemporal(), MMO->isInvariant()));<br>
ID.AddInteger(MMO->getPointerInfo().getAddrSpace());<br>
void *IP = nullptr;<br>
- if (SDNode *E = CSEMap.FindNodeOrInsertPos(ID, IP)) {<br>
+ if (SDNode *E = FindNodeOrInsertPos(ID, dl.getDebugLoc(), IP)) {<br>
cast<MaskedStoreSDNode>(E)->refineAlignment(MMO);<br>
return SDValue(E, 0);<br>
}<br>
@@ -5137,7 +5172,7 @@ SelectionDAG::getMaskedGather(SDVTList V<br>
MMO->isInvariant()));<br>
ID.AddInteger(MMO->getPointerInfo().getAddrSpace());<br>
void *IP = nullptr;<br>
- if (SDNode *E = CSEMap.FindNodeOrInsertPos(ID, IP)) {<br>
+ if (SDNode *E = FindNodeOrInsertPos(ID, dl.getDebugLoc(), IP)) {<br>
cast<MaskedGatherSDNode>(E)->refineAlignment(MMO);<br>
return SDValue(E, 0);<br>
}<br>
@@ -5160,7 +5195,7 @@ SDValue SelectionDAG::getMaskedScatter(S<br>
MMO->isInvariant()));<br>
ID.AddInteger(MMO->getPointerInfo().getAddrSpace());<br>
void *IP = nullptr;<br>
- if (SDNode *E = CSEMap.FindNodeOrInsertPos(ID, IP)) {<br>
+ if (SDNode *E = FindNodeOrInsertPos(ID, dl.getDebugLoc(), IP)) {<br>
cast<MaskedScatterSDNode>(E)->refineAlignment(MMO);<br>
return SDValue(E, 0);<br>
}<br>
@@ -5236,7 +5271,7 @@ SDValue SelectionDAG::getNode(unsigned O<br>
AddNodeIDNode(ID, Opcode, VTs, Ops);<br>
void *IP = nullptr;<br>
<br>
- if (SDNode *E = CSEMap.FindNodeOrInsertPos(ID, IP))<br>
+ if (SDNode *E = FindNodeOrInsertPos(ID, DL.getDebugLoc(), IP))<br>
return SDValue(E, 0);<br>
<br>
N = new (NodeAllocator) SDNode(Opcode, DL.getIROrder(), DL.getDebugLoc(),<br>
@@ -5291,7 +5326,7 @@ SDValue SelectionDAG::getNode(unsigned O<br>
FoldingSetNodeID ID;<br>
AddNodeIDNode(ID, Opcode, VTList, Ops);<br>
void *IP = nullptr;<br>
- if (SDNode *E = CSEMap.FindNodeOrInsertPos(ID, IP))<br>
+ if (SDNode *E = FindNodeOrInsertPos(ID, DL.getDebugLoc(), IP))<br>
return SDValue(E, 0);<br>
<br>
if (NumOps == 1) {<br>
@@ -5717,7 +5752,7 @@ SDNode *SelectionDAG::MorphNodeTo(SDNode<br>
if (VTs.VTs[VTs.NumVTs-1] != MVT::Glue) {<br>
FoldingSetNodeID ID;<br>
AddNodeIDNode(ID, Opc, VTs, Ops);<br>
- if (SDNode *ON = CSEMap.FindNodeOrInsertPos(ID, IP))<br>
+ if (SDNode *ON = FindNodeOrInsertPos(ID, N->getDebugLoc(), IP))<br>
return UpdadeSDLocOnMergedSDNode(ON, SDLoc(N));<br>
}<br>
<br>
@@ -5923,7 +5958,7 @@ SelectionDAG::getMachineNode(unsigned Op<br>
FoldingSetNodeID ID;<br>
AddNodeIDNode(ID, ~Opcode, VTs, OpsArray);<br>
IP = nullptr;<br>
- if (SDNode *E = CSEMap.FindNodeOrInsertPos(ID, IP)) {<br>
+ if (SDNode *E = FindNodeOrInsertPos(ID, DL.getDebugLoc(), IP)) {<br>
return cast<MachineSDNode>(UpdadeSDLocOnMergedSDNode(E, DL));<br>
}<br>
}<br>
@@ -5982,7 +6017,7 @@ SDNode *SelectionDAG::getNodeIfExists(un<br>
AddNodeIDNode(ID, Opcode, VTList, Ops);<br>
AddNodeIDFlags(ID, Opcode, Flags);<br>
void *IP = nullptr;<br>
- if (SDNode *E = CSEMap.FindNodeOrInsertPos(ID, IP))<br>
+ if (SDNode *E = FindNodeOrInsertPos(ID, DebugLoc(), IP))<br>
return E;<br>
}<br>
return nullptr;<br>
<br>
Modified: llvm/trunk/test/DebugInfo/AArch64/constant-dbgloc.ll<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_llvm_trunk_test_DebugInfo_AArch64_constant-2Ddbgloc.ll-3Frev-3D237237-26r1-3D237236-26r2-3D237237-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=jgg6iFMuQCLVChVm_m_fuGdoujDRQbrgWsoqlMFK_kg&s=rINDSpSJfqbgN7TXcBuofz4RGKq8ah6az9Gjp3pGrMM&e=" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/AArch64/constant-dbgloc.ll?rev=237237&r1=237236&r2=237237&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/AArch64/constant-dbgloc.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/AArch64/constant-dbgloc.ll Wed May 13 03:58:03 2015<br>
@@ -1,6 +1,4 @@<br>
; RUN: llc -filetype=asm %s -o - | FileCheck %s<br>
-; XFAIL: *<br>
-; disabled until constant coalescing is resolved<br>
<br>
target datalayout = "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64"<br>
target triple = "aarch64--linux-gnueabihf"<br>
<br>
Modified: llvm/trunk/test/DebugInfo/ARM/constant-dbgloc.ll<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_llvm_trunk_test_DebugInfo_ARM_constant-2Ddbgloc.ll-3Frev-3D237237-26r1-3D237236-26r2-3D237237-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=jgg6iFMuQCLVChVm_m_fuGdoujDRQbrgWsoqlMFK_kg&s=tS_B6QP_jHlaeY0b70DKy7G-kXqSvYlhlVgtY252zb8&e=" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/ARM/constant-dbgloc.ll?rev=237237&r1=237236&r2=237237&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/ARM/constant-dbgloc.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/ARM/constant-dbgloc.ll Wed May 13 03:58:03 2015<br>
@@ -1,6 +1,4 @@<br>
; RUN: llc -filetype=asm %s -o - | FileCheck %s<br>
-; XFAIL: *<br>
-; disabled until constant coalescing is resolved<br>
<br>
target datalayout = "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64"<br>
target triple = "armv7--linux-gnueabihf"<br>
<br>
Added: llvm/trunk/test/DebugInfo/ARM/multiple-constant-uses-drops-dbgloc.ll<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_llvm_trunk_test_DebugInfo_ARM_multiple-2Dconstant-2Duses-2Ddrops-2Ddbgloc.ll-3Frev-3D237237-26view-3Dauto&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=jgg6iFMuQCLVChVm_m_fuGdoujDRQbrgWsoqlMFK_kg&s=juj_PU3mycfhCMguJXsZ7BT7gfLwYXGeTfxVtTuncpc&e=" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/ARM/multiple-constant-uses-drops-dbgloc.ll?rev=237237&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/ARM/multiple-constant-uses-drops-dbgloc.ll (added)<br>
+++ llvm/trunk/test/DebugInfo/ARM/multiple-constant-uses-drops-dbgloc.ll Wed May 13 03:58:03 2015<br>
@@ -0,0 +1,54 @@<br>
+; RUN: llc -filetype=asm -asm-verbose=0 < %s | FileCheck %s<br>
+<br>
+; char ch;<br>
+; int b;<br>
+;<br>
+; void proc (void)<br>
+; {<br>
+; ch = 'A';<br>
+; b = 0; // <== this should have correct location<br>
+; }<br>
+<br>
+; CHECK: .loc 1 7 7<br>
+; CHECK: mov r{{[0-9]}}, #0<br>
+<br>
+target datalayout = "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64"<br>
+target triple = "armv7--linux-gnueabihf"<br>
+<br>
+@ch = common global i8 0, align 1<br>
+@b = common global i32 0, align 4<br>
+<br>
+; Function Attrs: nounwind<br>
+define void @proc() #0 {<br>
+entry:<br>
+ store i8 65, i8* @ch, align 1, !dbg !17<br>
+ store i32 0, i32* @b, align 4, !dbg !18<br>
+ ret void, !dbg !19<br>
+}<br>
+<br>
+attributes #0 = { nounwind "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="cortex-a8" "target-features"="+neon,+vfp3" "unsafe-fp-math"="false" "use-soft-float"="false" }<br>
+<br>
+!<a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.dbg.cu&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=jgg6iFMuQCLVChVm_m_fuGdoujDRQbrgWsoqlMFK_kg&s=r8d2u_mA3zUwFsFH86_IGd0P25FnYyhxmDJoZPIwTMg&e=" target="_blank">llvm.dbg.cu</a> = !{!0}<br>
+!llvm.module.flags = !{!12, !13, !14, !15}<br>
+!llvm.ident = !{!16}<br>
+<br>
+!0 = !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "", isOptimized: false, subprograms: !3)<br>
+!1 = !DIFile(filename: "test.c", directory: "/home/user/clang/build")<br>
+!2 = !{}<br>
+!3 = !{!4}<br>
+!4 = !DISubprogram(name: "proc", scope: !1, file: !1, line: 4, type: !5, isLocal: false, isDefinition: true, scopeLine: 5, flags: DIFlagPrototyped, isOptimized: false, function: void ()* @proc, variables: !2)<br>
+!5 = !DISubroutineType(types: !6)<br>
+!6 = !{null}<br>
+!7 = !{!8, !10}<br>
+!8 = !DIGlobalVariable(name: "ch", scope: !0, file: !1, line: 1, type: !9, isLocal: false, isDefinition: true, variable: i8* @ch)<br>
+!9 = !DIBasicType(name: "char", size: 8, align: 8, encoding: DW_ATE_unsigned_char)<br>
+!10 = !DIGlobalVariable(name: "b", scope: !0, file: !1, line: 2, type: !11, isLocal: false, isDefinition: true, variable: i32* @b)<br>
+!11 = !DIBasicType(name: "int", size: 32, align: 32, encoding: DW_ATE_signed)<br>
+!12 = !{i32 2, !"Dwarf Version", i32 4}<br>
+!13 = !{i32 2, !"Debug Info Version", i32 3}<br>
+!14 = !{i32 1, !"wchar_size", i32 4}<br>
+!15 = !{i32 1, !"min_enum_size", i32 4}<br>
+!16 = !{!"clang version 3.7.0 (<a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_git_clang.git&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=jgg6iFMuQCLVChVm_m_fuGdoujDRQbrgWsoqlMFK_kg&s=M0VQuhh-8Keyo6EdsSVjbv5BualBsda_zohFHUmkj4I&e=" target="_blank">http://llvm.org/git/clang.git</a> 9b0abb9df531ef7928c8182120e1869affca17d5) (<a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_git_llvm.git&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=jgg6iFMuQCLVChVm_m_fuGdoujDRQbrgWsoqlMFK_kg&s=3sSuze5n5rISHRDLyjGpF2napLH011-HsWxZxPyQ1QM&e=" target="_blank">http://llvm.org/git/llvm.git</a> b1e759524dd94f7ce1e24935daed8383927e96c1)"}<br>
+!17 = !DILocation(line: 6, column: 8, scope: !4)<br>
+!18 = !DILocation(line: 7, column: 7, scope: !4)<br>
+!19 = !DILocation(line: 8, column: 1, scope: !4)<br>
<br>
Added: llvm/trunk/test/DebugInfo/ARM/single-constant-use-preserves-dbgloc.ll<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_llvm_trunk_test_DebugInfo_ARM_single-2Dconstant-2Duse-2Dpreserves-2Ddbgloc.ll-3Frev-3D237237-26view-3Dauto&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=jgg6iFMuQCLVChVm_m_fuGdoujDRQbrgWsoqlMFK_kg&s=x0oir7aflBTicdkgyVt4lCBE_cuzlIEff5gELTgOAKA&e=" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/ARM/single-constant-use-preserves-dbgloc.ll?rev=237237&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/ARM/single-constant-use-preserves-dbgloc.ll (added)<br>
+++ llvm/trunk/test/DebugInfo/ARM/single-constant-use-preserves-dbgloc.ll Wed May 13 03:58:03 2015<br>
@@ -0,0 +1,72 @@<br>
+; RUN: llc -filetype=asm -asm-verbose=0 < %s | FileCheck %s<br>
+<br>
+; int main()<br>
+; {<br>
+; int x = 0;<br>
+; if (x > 0)<br>
+; return x;<br>
+; x = -1; // <== this line should have correct debug location<br>
+; return -1;<br>
+; }<br>
+<br>
+; CHECK: .loc 1 6 7<br>
+; CHECK: mvn<br>
+<br>
+target datalayout = "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64"<br>
+target triple = "armv7--linux-gnueabihf"<br>
+<br>
+; Function Attrs: nounwind<br>
+define i32 @main() {<br>
+entry:<br>
+ %retval = alloca i32, align 4<br>
+ %x = alloca i32, align 4<br>
+ store i32 0, i32* %retval<br>
+ call void @llvm.dbg.declare(metadata i32* %x, metadata !10, metadata !11), !dbg !12<br>
+ store i32 0, i32* %x, align 4, !dbg !12<br>
+ %0 = load i32, i32* %x, align 4, !dbg !13<br>
+ %cmp = icmp sgt i32 %0, 0, !dbg !15<br>
+ br i1 %cmp, label %if.then, label %if.end, !dbg !16<br>
+<br>
+if.then: ; preds = %entry<br>
+ %1 = load i32, i32* %x, align 4, !dbg !17<br>
+ store i32 %1, i32* %retval, !dbg !18<br>
+ br label %return, !dbg !18<br>
+<br>
+if.end: ; preds = %entry<br>
+ store i32 -1, i32* %x, align 4, !dbg !19<br>
+ store i32 -1, i32* %retval, !dbg !20<br>
+ br label %return, !dbg !20<br>
+<br>
+return: ; preds = %if.end, %if.then<br>
+ %2 = load i32, i32* %retval, !dbg !21<br>
+ ret i32 %2, !dbg !21<br>
+}<br>
+<br>
+; Function Attrs: nounwind readnone<br>
+declare void @llvm.dbg.declare(metadata, metadata, metadata)<br>
+<br>
+!<a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.dbg.cu&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=jgg6iFMuQCLVChVm_m_fuGdoujDRQbrgWsoqlMFK_kg&s=r8d2u_mA3zUwFsFH86_IGd0P25FnYyhxmDJoZPIwTMg&e=" target="_blank">llvm.dbg.cu</a> = !{!0}<br>
+!llvm.module.flags = !{!8, !9}<br>
+<br>
+!0 = !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "", isOptimized: false, subprograms: !3)<br>
+!1 = !DIFile(filename: "test.c", directory: "/home/user/clang/build")<br>
+!2 = !{}<br>
+!3 = !{!4}<br>
+!4 = !DISubprogram(name: "main", scope: !1, file: !1, line: 1, type: !5, isLocal: false, isDefinition: true, scopeLine: 2, isOptimized: false, function: i32 ()* @main, variables: !2)<br>
+!5 = !DISubroutineType(types: !6)<br>
+!6 = !{!7}<br>
+!7 = !DIBasicType(name: "int", size: 32, align: 32, encoding: DW_ATE_signed)<br>
+!8 = !{i32 2, !"Dwarf Version", i32 4}<br>
+!9 = !{i32 2, !"Debug Info Version", i32 3}<br>
+!10 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "x", scope: !4, file: !1, line: 3, type: !7)<br>
+!11 = !DIExpression()<br>
+!12 = !DILocation(line: 3, column: 9, scope: !4)<br>
+!13 = !DILocation(line: 4, column: 9, scope: !14)<br>
+!14 = distinct !DILexicalBlock(scope: !4, file: !1, line: 4, column: 9)<br>
+!15 = !DILocation(line: 4, column: 11, scope: !14)<br>
+!16 = !DILocation(line: 4, column: 9, scope: !4)<br>
+!17 = !DILocation(line: 5, column: 13, scope: !14)<br>
+!18 = !DILocation(line: 5, column: 9, scope: !14)<br>
+!19 = !DILocation(line: 6, column: 7, scope: !4)<br>
+!20 = !DILocation(line: 7, column: 5, scope: !4)<br>
+!21 = !DILocation(line: 8, column: 1, scope: !4)<br>
<br>
Modified: llvm/trunk/test/DebugInfo/constant-sdnodes-have-dbg-location.ll<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_llvm_trunk_test_DebugInfo_constant-2Dsdnodes-2Dhave-2Ddbg-2Dlocation.ll-3Frev-3D237237-26r1-3D237236-26r2-3D237237-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=jgg6iFMuQCLVChVm_m_fuGdoujDRQbrgWsoqlMFK_kg&s=CLnizOL9bM65s5e62SHaonebQt9XGgAgtBXGeN0cWt4&e=" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/constant-sdnodes-have-dbg-location.ll?rev=237237&r1=237236&r2=237237&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/constant-sdnodes-have-dbg-location.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/constant-sdnodes-have-dbg-location.ll Wed May 13 03:58:03 2015<br>
@@ -1,7 +1,5 @@<br>
; RUN: llc -debug < %s 2>&1 | FileCheck %s<br>
; REQUIRES: asserts<br>
-; XFAIL: *<br>
-; disabled until constant coalescing is resolved<br>
<br>
; CHECK: 0x{{[0-9,a-f]+}}: i32 = Constant<-1>test.c:4:5<br>
<br>
<br>
Added: llvm/trunk/test/DebugInfo/constantfp-sdnodes-have-dbg-location.ll<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_llvm_trunk_test_DebugInfo_constantfp-2Dsdnodes-2Dhave-2Ddbg-2Dlocation.ll-3Frev-3D237237-26view-3Dauto&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=jgg6iFMuQCLVChVm_m_fuGdoujDRQbrgWsoqlMFK_kg&s=zO2e873YqrZzOGjidXlnQDykVdirxnEtDJ1nAXlkqAI&e=" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/constantfp-sdnodes-have-dbg-location.ll?rev=237237&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/constantfp-sdnodes-have-dbg-location.ll (added)<br>
+++ llvm/trunk/test/DebugInfo/constantfp-sdnodes-have-dbg-location.ll Wed May 13 03:58:03 2015<br>
@@ -0,0 +1,24 @@<br>
+; RUN: llc -debug < %s 2>&1 | FileCheck %s<br>
+; REQUIRES: asserts<br>
+<br>
+; CHECK: 0x{{[0-9,a-f]+}}: f64 = ConstantFP<1.500000e+00>test.c:3:5<br>
+<br>
+define double @f() {<br>
+entry:<br>
+ ret double 1.500000e+00, !dbg !10<br>
+}<br>
+<br>
+!<a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.dbg.cu&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=jgg6iFMuQCLVChVm_m_fuGdoujDRQbrgWsoqlMFK_kg&s=r8d2u_mA3zUwFsFH86_IGd0P25FnYyhxmDJoZPIwTMg&e=" target="_blank">llvm.dbg.cu</a> = !{!0}<br>
+!llvm.module.flags = !{!8, !9}<br>
+<br>
+!0 = !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "", isOptimized: false, subprograms: !3)<br>
+!1 = !DIFile(filename: "test.c", directory: "/home/user/clang-llvm/build")<br>
+!2 = !{}<br>
+!3 = !{!4}<br>
+!4 = !DISubprogram(name: "f", scope: !1, file: !1, line: 1, type: !5, isLocal: false, isDefinition: true, scopeLine: 2, flags: DIFlagPrototyped, isOptimized: false, function: double ()* @f, variables: !2)<br>
+!5 = !DISubroutineType(types: !6)<br>
+!6 = !{!7}<br>
+!7 = !DIBasicType(name: "double", size: 64, align: 64, encoding: DW_ATE_float)<br>
+!8 = !{i32 2, !"Dwarf Version", i32 4}<br>
+!9 = !{i32 2, !"Debug Info Version", i32 3}<br>
+!10 = !DILocation(line: 3, column: 5, scope: !4)<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>