[llvm-commits] [llvm] r69990 - in /llvm/trunk: lib/CodeGen/SelectionDAG/SelectionDAG.cpp test/CodeGen/Generic/fp-to-int-invalid.ll
Dale Johannesen
dalej at apple.com
Fri Apr 24 14:34:14 PDT 2009
Author: johannes
Date: Fri Apr 24 16:34:13 2009
New Revision: 69990
URL: http://llvm.org/viewvc/llvm-project?rev=69990&view=rev
Log:
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.
Added:
llvm/trunk/test/CodeGen/Generic/fp-to-int-invalid.ll
Modified:
llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp?rev=69990&r1=69989&r2=69990&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp Fri Apr 24 16:34:13 2009
@@ -2197,16 +2197,17 @@
}
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)
Added: llvm/trunk/test/CodeGen/Generic/fp-to-int-invalid.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Generic/fp-to-int-invalid.ll?rev=69990&view=auto
==============================================================================
--- llvm/trunk/test/CodeGen/Generic/fp-to-int-invalid.ll (added)
+++ llvm/trunk/test/CodeGen/Generic/fp-to-int-invalid.ll Fri Apr 24 16:34:13 2009
@@ -0,0 +1,18 @@
+; RUN: llvm-as < %s | llc
+; PR4057
+define void @test_cast_float_to_char(i8* %result) nounwind {
+entry:
+ %result_addr = alloca i8* ; <i8**> [#uses=2]
+ %test = alloca float ; <float*> [#uses=2]
+ %"alloca point" = bitcast i32 0 to i32 ; <i32> [#uses=0]
+ store i8* %result, i8** %result_addr
+ store float 0x40B2AFA160000000, float* %test, align 4
+ %0 = load float* %test, align 4 ; <float> [#uses=1]
+ %1 = fptosi float %0 to i8 ; <i8> [#uses=1]
+ %2 = load i8** %result_addr, align 4 ; <i8*> [#uses=1]
+ store i8 %1, i8* %2, align 1
+ br label %return
+
+return: ; preds = %entry
+ ret void
+}
More information about the llvm-commits
mailing list