aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2017-01-04 22:25:16 +0000
committerDimitry Andric <dim@FreeBSD.org>2017-01-04 22:25:16 +0000
commit4b570baa7e867c652fa7d690585098278082fae9 (patch)
treec6e77230776692322e962bcf30eaf96abfc4bb08
parentc82ad72f63369bc462e59458f09960d66daa58a9 (diff)
downloadsrc-4b570baa7e867c652fa7d690585098278082fae9.tar.gz
src-4b570baa7e867c652fa7d690585098278082fae9.zip
Vendor import of llvm trunk r291015:vendor/llvm/llvm-trunk-r291015
Notes
Notes: svn path=/vendor/llvm/dist/; revision=311328 svn path=/vendor/llvm/llvm-trunk-r291012/dist/; revision=311329; tag=vendor/llvm/llvm-trunk-r291015
-rw-r--r--include/llvm/Support/FileSystem.h4
-rw-r--r--lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp6
-rw-r--r--test/CodeGen/AArch64/fptouint-i8-zext.ll4
-rw-r--r--test/CodeGen/PowerPC/fp64-to-int16.ll21
4 files changed, 31 insertions, 4 deletions
diff --git a/include/llvm/Support/FileSystem.h b/include/llvm/Support/FileSystem.h
index 347f21108913..586999794d50 100644
--- a/include/llvm/Support/FileSystem.h
+++ b/include/llvm/Support/FileSystem.h
@@ -858,7 +858,7 @@ public:
// No operator++ because we need error_code.
recursive_directory_iterator &increment(std::error_code &ec) {
- const directory_iterator end_itr;
+ const directory_iterator end_itr = {};
if (State->HasNoPushRequest)
State->HasNoPushRequest = false;
@@ -905,7 +905,7 @@ public:
assert(State && "Cannot pop an end iterator!");
assert(State->Level > 0 && "Cannot pop an iterator with level < 1");
- const directory_iterator end_itr;
+ const directory_iterator end_itr = {};
std::error_code ec;
do {
if (ec)
diff --git a/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp b/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp
index 1a92d4a8b595..a37f4e1116b4 100644
--- a/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp
+++ b/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp
@@ -428,7 +428,11 @@ SDValue DAGTypeLegalizer::PromoteIntRes_FP_TO_XINT(SDNode *N) {
// Assert that the converted value fits in the original type. If it doesn't
// (eg: because the value being converted is too big), then the result of the
// original operation was undefined anyway, so the assert is still correct.
- return DAG.getNode(NewOpc == ISD::FP_TO_UINT ?
+ //
+ // NOTE: fp-to-uint to fp-to-sint promotion guarantees zero extend. For example:
+ // before legalization: fp-to-uint16, 65534. -> 0xfffe
+ // after legalization: fp-to-sint32, 65534. -> 0x0000fffe
+ return DAG.getNode(N->getOpcode() == ISD::FP_TO_UINT ?
ISD::AssertZext : ISD::AssertSext, dl, NVT, Res,
DAG.getValueType(N->getValueType(0).getScalarType()));
}
diff --git a/test/CodeGen/AArch64/fptouint-i8-zext.ll b/test/CodeGen/AArch64/fptouint-i8-zext.ll
index 682683751a8c..4e07c62ba99c 100644
--- a/test/CodeGen/AArch64/fptouint-i8-zext.ll
+++ b/test/CodeGen/AArch64/fptouint-i8-zext.ll
@@ -3,9 +3,11 @@
target datalayout = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128"
target triple = "aarch64"
+; If the float value is negative or too large, the result is undefined anyway;
+; otherwise, fcvtzs must returns a value in [0, 256), which guarantees zext.
+
; CHECK-LABEL: float_char_int_func:
; CHECK: fcvtzs [[A:w[0-9]+]], s0
-; CHECK-NEXT: and w0, [[A]], #0xff
; CHECK-NEXT: ret
define i32 @float_char_int_func(float %infloatVal) {
entry:
diff --git a/test/CodeGen/PowerPC/fp64-to-int16.ll b/test/CodeGen/PowerPC/fp64-to-int16.ll
new file mode 100644
index 000000000000..10d58c2d7669
--- /dev/null
+++ b/test/CodeGen/PowerPC/fp64-to-int16.ll
@@ -0,0 +1,21 @@
+; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
+; RUN: llc -O0 < %s | FileCheck %s
+target triple = "powerpc64le--linux-gnu"
+
+define i1 @Test(double %a) {
+; CHECK-LABEL: Test:
+; CHECK: # BB#0: # %entry
+; CHECK-NEXT: xscvdpsxws 1, 1
+; CHECK-NEXT: mfvsrwz 3, 1
+; CHECK-NEXT: xori 3, 3, 65534
+; CHECK-NEXT: cntlzw 3, 3
+; CHECK-NEXT: srwi 3, 3, 5
+; CHECK-NEXT: # implicit-def: %X4
+; CHECK-NEXT: mr 4, 3
+; CHECK-NEXT: mr 3, 4
+; CHECK-NEXT: blr
+entry:
+ %conv = fptoui double %a to i16
+ %cmp = icmp eq i16 %conv, -2
+ ret i1 %cmp
+}