[llvm-branch-commits] [llvm-tag] r103317 - in /llvm/tags/Apple/llvmCore-2328.5: ./ lib/CodeGen/SelectionDAG/InstrEmitter.cpp lib/VMCore/AsmWriter.cpp test/CodeGen/Generic/legalize-dbg-value.ll test/CodeGen/X86/fp-elim.ll
Bill Wendling
isanbard at gmail.com
Fri May 7 16:00:05 PDT 2010
Author: void
Date: Fri May 7 18:00:05 2010
New Revision: 103317
URL: http://llvm.org/viewvc/llvm-project?rev=103317&view=rev
Log:
Creating llvmCore-2328.5, which is llvmCore-2328.4 + r103309 r103310 r103314
Added:
llvm/tags/Apple/llvmCore-2328.5/ (props changed)
- copied from r103315, llvm/tags/Apple/llvmCore-2328.4/
llvm/tags/Apple/llvmCore-2328.5/test/CodeGen/Generic/legalize-dbg-value.ll
- copied unchanged from r103310, llvm/trunk/test/CodeGen/Generic/legalize-dbg-value.ll
Modified:
llvm/tags/Apple/llvmCore-2328.5/lib/CodeGen/SelectionDAG/InstrEmitter.cpp
llvm/tags/Apple/llvmCore-2328.5/lib/VMCore/AsmWriter.cpp
llvm/tags/Apple/llvmCore-2328.5/test/CodeGen/X86/fp-elim.ll
Propchange: llvm/tags/Apple/llvmCore-2328.5/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri May 7 18:00:05 2010
@@ -0,0 +1,22 @@
+Debug
+Release
+Release-Asserts
+mklib
+Makefile.config
+config.log
+config.status
+cvs.out
+autom4te.cache
+configure.out
+LLVM-*
+_distcheckdir
+llvm.spec
+svn-commit.*
+*.patch
+*.patch.raw
+cscope.*
+Debug+Coverage-Asserts
+Release+Coverage-Asserts
+Debug+Coverage
+Release+Coverage
+Debug+Checks
Propchange: llvm/tags/Apple/llvmCore-2328.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 7 18:00:05 2010
@@ -0,0 +1,3 @@
+/llvm/branches/Apple/Hermes:96832,96835,96858,96870,96876,96879
+/llvm/branches/Apple/Morbo:102992,103002
+/llvm/trunk:98602,98604,98612,98615-98616,98675,98686,98743-98744,98768,98773,98778,98780,98810,98835,98839,98845,98855,98862,98881,98920,98977,99032-99033,99043,99196,99223,99263,99282-99284,99306,99319-99321,99324,99336,99378,99418,99423,99429,99440,99455,99463,99465,99469,99484,99490,99492-99494,99507,99524,99537,99539-99540,99544,99570,99575,99598,99620,99629-99630,99636,99671,99692,99695,99697,99699,99722,99816,99835-99836,99845-99846,99848,99850,99855,99879,99881-99883,99895,99899,99910,99916,99919,99952-99954,99957,99959,99974-99975,99982,99984-99986,99988,99992-99993,99995,99997-99999,100016,100035,100037-100038,100042,100044,100056,100072,100074,100078,100081-100090,100092,100094-100095,100116,100134,100184,100209,100214-100218,100220-100221,100223-100225,100231,100250,100252,100257,100261,100304,100332,100353,100384,100454-100455,100457,100466,100478,100480,100487,100494,100497,100505,100521,100553,100568,100584,100592,100609-100610,100636,100710,100736,100742,1007
51,100768-100769,100771,100781,100797,100804,100837,100867,100892,100936-100937,101011,101023,101075,101077,101079,101081,101085,101154,101158,101162,101165,101181,101190,101202,101282,101303,101314-101315,101317,101331,101343,101383,101392,101420,101453,101604,101615,101629,101684-101686,101805,101845,101847,101851,101855,101870,101879,101897,101925,101930,101965,102120,102225,102358,102394,102405,102421,102454,102463,102468,102470,102481,102486,102504-102505,102508-102510,102513,102519,102524,102526,102531,102646,102672,102980,102993,103001,103309-103310,103314
Modified: llvm/tags/Apple/llvmCore-2328.5/lib/CodeGen/SelectionDAG/InstrEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/tags/Apple/llvmCore-2328.5/lib/CodeGen/SelectionDAG/InstrEmitter.cpp?rev=103317&r1=103315&r2=103317&view=diff
==============================================================================
--- llvm/tags/Apple/llvmCore-2328.5/lib/CodeGen/SelectionDAG/InstrEmitter.cpp (original)
+++ llvm/tags/Apple/llvmCore-2328.5/lib/CodeGen/SelectionDAG/InstrEmitter.cpp Fri May 7 18:00:05 2010
@@ -539,7 +539,13 @@
} else if (SD->getKind() == SDDbgValue::CONST) {
Value *V = SD->getConst();
if (ConstantInt *CI = dyn_cast<ConstantInt>(V)) {
- MIB.addImm(CI->getSExtValue());
+ // FIXME: SDDbgValues aren't updated with legalization, so it's possible
+ // to have i128 values in them at this point. As a crude workaround, just
+ // drop the debug info if this happens.
+ if (!CI->getValue().isSignedIntN(64))
+ MIB.addReg(0U);
+ else
+ MIB.addImm(CI->getSExtValue());
} else if (ConstantFP *CF = dyn_cast<ConstantFP>(V)) {
MIB.addFPImm(CF);
} else {
Modified: llvm/tags/Apple/llvmCore-2328.5/lib/VMCore/AsmWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/tags/Apple/llvmCore-2328.5/lib/VMCore/AsmWriter.cpp?rev=103317&r1=103315&r2=103317&view=diff
==============================================================================
--- llvm/tags/Apple/llvmCore-2328.5/lib/VMCore/AsmWriter.cpp (original)
+++ llvm/tags/Apple/llvmCore-2328.5/lib/VMCore/AsmWriter.cpp Fri May 7 18:00:05 2010
@@ -2010,9 +2010,9 @@
return;
ConstantInt *CI = dyn_cast_or_null<ConstantInt>(Node->getOperand(0));
if (!CI) return;
- unsigned Val = CI->getZExtValue();
- unsigned Tag = Val & ~LLVMDebugVersionMask;
- if (Val < LLVMDebugVersion)
+ APInt Val = CI->getValue();
+ APInt Tag = Val & ~APInt(Val.getBitWidth(), LLVMDebugVersionMask);
+ if (Val.ult(LLVMDebugVersion))
return;
Out.PadToColumn(50);
@@ -2026,8 +2026,10 @@
Out << "; [ DW_TAG_vector_type ]";
else if (Tag == dwarf::DW_TAG_user_base)
Out << "; [ DW_TAG_user_base ]";
- else if (const char *TagName = dwarf::TagString(Tag))
- Out << "; [ " << TagName << " ]";
+ else if (Tag.isIntN(32)) {
+ if (const char *TagName = dwarf::TagString(Tag.getZExtValue()))
+ Out << "; [ " << TagName << " ]";
+ }
}
void AssemblyWriter::writeAllMDNodes() {
Modified: llvm/tags/Apple/llvmCore-2328.5/test/CodeGen/X86/fp-elim.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/tags/Apple/llvmCore-2328.5/test/CodeGen/X86/fp-elim.ll?rev=103317&r1=103315&r2=103317&view=diff
==============================================================================
--- llvm/tags/Apple/llvmCore-2328.5/test/CodeGen/X86/fp-elim.ll (original)
+++ llvm/tags/Apple/llvmCore-2328.5/test/CodeGen/X86/fp-elim.ll Fri May 7 18:00:05 2010
@@ -1,7 +1,9 @@
; RUN: llc < %s -march=x86 -asm-verbose=false | FileCheck %s -check-prefix=FP-ELIM
; RUN: llc < %s -march=x86 -asm-verbose=false -disable-fp-elim | FileCheck %s -check-prefix=NO-ELIM
; RUN: llc < %s -march=x86 -asm-verbose=false -disable-non-leaf-fp-elim | FileCheck %s -check-prefix=NON-LEAF
+; XFAIL:*
+; FIXME: Temporarily reverted.
; Implement -momit-leaf-frame-pointer
; rdar://7886181
More information about the llvm-branch-commits
mailing list