https://github.com/a-tarasyuk updated
https://github.com/llvm/llvm-project/pull/105727
>From d8bed3f4db8056a6afa9bd7eae5d4a8361f83086 Mon Sep 17 00:00:00 2001
From: Oleksandr T <oleksandr.taras...@outlook.com>
Date: Thu, 22 Aug 2024 23:25:31 +0300
Subject: [PATCH 1/2] [Clang] prevent assertion failure when converting vectors
to int/float with invalid expressions
---
clang/docs/ReleaseNotes.rst | 1 +
clang/lib/Sema/SemaExpr.cpp | 6 ++++++
clang/test/SemaCXX/vector.cpp | 14 ++++++++++++++
3 files changed, 21 insertions(+)
diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst
index 12a924acc14331..27aac987011dea 100644
--- a/clang/docs/ReleaseNotes.rst
+++ b/clang/docs/ReleaseNotes.rst
@@ -296,6 +296,7 @@ Bug Fixes to C++ Support
template depth than the friend function template. (#GH98258)
- Clang now rebuilds the template parameters of out-of-line declarations and
specializations in the context
of the current instantiation in all cases.
+- Fixed an assertion failure when converting vectors to int/float with invalid
expressions. (#GH105486)
Bug Fixes to AST Handling
^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp
index c67183df335dd5..58825ef89213d2 100644
--- a/clang/lib/Sema/SemaExpr.cpp
+++ b/clang/lib/Sema/SemaExpr.cpp
@@ -9889,6 +9889,9 @@ static ExprResult convertVector(Expr *E, QualType
ElementType, Sema &S) {
/// IntTy without losing precision.
static bool canConvertIntToOtherIntTy(Sema &S, ExprResult *Int,
QualType OtherIntTy) {
+ if (Int->get()->isValueDependent())
+ return false;
+
QualType IntTy = Int->get()->getType().getUnqualifiedType();
// Reject cases where the value of the Int is unknown as that would
@@ -9927,6 +9930,9 @@ static bool canConvertIntToOtherIntTy(Sema &S, ExprResult
*Int,
/// FloatTy without losing precision.
static bool canConvertIntTyToFloatTy(Sema &S, ExprResult *Int,
QualType FloatTy) {
+ if (Int->get()->isValueDependent())
+ return false;
+
QualType IntTy = Int->get()->getType().getUnqualifiedType();
// Determine if the integer constant can be expressed as a floating point
diff --git a/clang/test/SemaCXX/vector.cpp b/clang/test/SemaCXX/vector.cpp
index 7c8ee89814e578..808bdb679b09cd 100644
--- a/clang/test/SemaCXX/vector.cpp
+++ b/clang/test/SemaCXX/vector.cpp
@@ -772,3 +772,17 @@ void test_scoped_enum_vector(EnumClass ea, v2u v2ua) {
}
#endif
}
+
+namespace GH105486 {
+__attribute__((__vector_size__(sizeof(double)))) double a;
+double b = a - (long)(*0); // expected-error {{indirection requires pointer
operand ('int' invalid)}} \
+ // expected-error {{cannot initialize a variable of
type 'double' with an rvalue of type '__attribute__((__vector_size__(1 *
sizeof(double)))) double' (vector of 1 'double' value)}}
+
+__attribute__((__vector_size__(sizeof(long)))) long c;
+long d = c - (long)(*0); // expected-error {{indirection requires pointer
operand ('int' invalid)}} \
+ // expected-error {{cannot initialize a variable of
type 'long' with an rvalue of type '__attribute__((__vector_size__(1 *
sizeof(long)))) long' (vector of 1 'long' value)}}
+
+const long long e = *0; // expected-error {{indirection requires pointer
operand ('int' invalid)}}
+double f = a - e; // expected-error {{cannot initialize a variable of
type 'double' with an rvalue of type '__attribute__((__vector_size__(1 *
sizeof(double)))) double' (vector of 1 'double' value)}}
+int h = c - e; // expected-error {{cannot initialize a variable of
type 'int' with an rvalue of type '__attribute__((__vector_size__(1 *
sizeof(long)))) long' (vector of 1 'long' value)}}
+}
>From 3a3832464269585858b384b61c9f879050774be4 Mon Sep 17 00:00:00 2001
From: Oleksandr T <oleksandr.taras...@outlook.com>
Date: Tue, 27 Aug 2024 18:58:09 +0300
Subject: [PATCH 2/2] use containsErrors
---
clang/lib/Sema/SemaExpr.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp
index e419606ab96753..de316f30e9523d 100644
--- a/clang/lib/Sema/SemaExpr.cpp
+++ b/clang/lib/Sema/SemaExpr.cpp
@@ -9888,7 +9888,7 @@ static ExprResult convertVector(Expr *E, QualType
ElementType, Sema &S) {
/// IntTy without losing precision.
static bool canConvertIntToOtherIntTy(Sema &S, ExprResult *Int,
QualType OtherIntTy) {
- if (Int->get()->isValueDependent())
+ if (Int->get()->containsErrors())
return false;
QualType IntTy = Int->get()->getType().getUnqualifiedType();
@@ -9929,7 +9929,7 @@ static bool canConvertIntToOtherIntTy(Sema &S, ExprResult
*Int,
/// FloatTy without losing precision.
static bool canConvertIntTyToFloatTy(Sema &S, ExprResult *Int,
QualType FloatTy) {
- if (Int->get()->isValueDependent())
+ if (Int->get()->containsErrors())
return false;
QualType IntTy = Int->get()->getType().getUnqualifiedType();
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
