aboutsummaryrefslogtreecommitdiffstats
path: root/lib/CodeGen
diff options
context:
space:
mode:
authorDale Johannesen <dalej@apple.com>2009-04-24 21:34:13 +0000
committerDale Johannesen <dalej@apple.com>2009-04-24 21:34:13 +0000
commit63d4503dc11f83298c82a64d21214b481a967e3f (patch)
tree57853f284d799d760e7490b90ac8c050027527c5 /lib/CodeGen
parent35f652a919369ea801dd10f8fb6c1c99ba7620eb (diff)
downloadexternal_llvm-63d4503dc11f83298c82a64d21214b481a967e3f.zip
external_llvm-63d4503dc11f83298c82a64d21214b481a967e3f.tar.gz
external_llvm-63d4503dc11f83298c82a64d21214b481a967e3f.tar.bz2
Fix PR 4057, a crash doing float->char const folding.
This particular one is undefined behavior (although this isn't related to the crash), so it will no longer do it at compile time, which seems better. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@69990 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen')
-rw-r--r--lib/CodeGen/SelectionDAG/SelectionDAG.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
index edd985e..954b842 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
@@ -2197,16 +2197,17 @@ SDValue SelectionDAG::getNode(unsigned Opcode, DebugLoc DL,
}
case ISD::FP_TO_SINT:
case ISD::FP_TO_UINT: {
- integerPart x;
+ integerPart x[2];
bool ignored;
assert(integerPartWidth >= 64);
// FIXME need to be more flexible about rounding mode.
- APFloat::opStatus s = V.convertToInteger(&x, 64U,
+ APFloat::opStatus s = V.convertToInteger(x, VT.getSizeInBits(),
Opcode==ISD::FP_TO_SINT,
APFloat::rmTowardZero, &ignored);
if (s==APFloat::opInvalidOp) // inexact is OK, in fact usual
break;
- return getConstant(x, VT);
+ APInt api(VT.getSizeInBits(), 2, x);
+ return getConstant(api, VT);
}
case ISD::BIT_CONVERT:
if (VT == MVT::i32 && C->getValueType(0) == MVT::f32)