Ris-Bali updated this revision to Diff 518300.
Ris-Bali marked 4 inline comments as done.
Ris-Bali added a comment.
Array test added
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D149514/new/
https://reviews.llvm.org/D149514
Files:
clang/docs/ReleaseNotes.rst
clang/lib/Sema/SemaChecking.cpp
clang/test/Sema/builtin-assume-aligned.c
Index: clang/test/Sema/builtin-assume-aligned.c
===================================================================
--- clang/test/Sema/builtin-assume-aligned.c
+++ clang/test/Sema/builtin-assume-aligned.c
@@ -71,6 +71,17 @@
return a[0];
}
+int test14(int *a, int b) {
+ a = (int *)__builtin_assume_aligned(b, 32); // expected-error {{incompatible
integer to pointer conversion passing 'int' to parameter of type 'const void *}}
+ return a[0];
+}
+
+int test15(int *b) {
+ int arr[3] = {1, 2, 3};
+ b = (int *)__builtin_assume_aligned(arr, 32);
+ return b[0];
+}
+
void test_void_assume_aligned(void) __attribute__((assume_aligned(32))); //
expected-warning {{'assume_aligned' attribute only applies to return values
that are pointers}}
int test_int_assume_aligned(void) __attribute__((assume_aligned(16))); //
expected-warning {{'assume_aligned' attribute only applies to return values
that are pointers}}
void *test_ptr_assume_aligned(void) __attribute__((assume_aligned(64))); //
no-warning
Index: clang/lib/Sema/SemaChecking.cpp
===================================================================
--- clang/lib/Sema/SemaChecking.cpp
+++ clang/lib/Sema/SemaChecking.cpp
@@ -7981,6 +7981,15 @@
DefaultFunctionArrayLvalueConversion(FirstArg);
if (FirstArgResult.isInvalid())
return true;
+ QualType FirstArgType = FirstArgResult.get()->getType();
+
+ if (checkBuiltinArgument(*this, TheCall, 0)) {
+ const QualType &ConstVoidPointerType =
+ Context.getPointerType(Context.VoidTy.withConst());
+ return Diag(FirstArg->getBeginLoc(),
+ diag::err_typecheck_convert_incompatible)
+ << FirstArgType << ConstVoidPointerType << 1 << 0 << 0;
+ }
TheCall->setArg(0, FirstArgResult.get());
}
Index: clang/docs/ReleaseNotes.rst
===================================================================
--- clang/docs/ReleaseNotes.rst
+++ clang/docs/ReleaseNotes.rst
@@ -338,6 +338,9 @@
- Fix crash when attempting to perform parenthesized initialization of an
aggregate with a base class with only non-public constructors.
(`#62296 <https://github.com/llvm/llvm-project/issues/62296>`_)
+- Fix crash when attempting to pass a non-pointer type as first argument of
+ ``__builtin_assume_aligned``.
+ (`#62305 <https://github.com/llvm/llvm-project/issues/62305>`)
Bug Fixes to Compiler Builtins
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Index: clang/test/Sema/builtin-assume-aligned.c
===================================================================
--- clang/test/Sema/builtin-assume-aligned.c
+++ clang/test/Sema/builtin-assume-aligned.c
@@ -71,6 +71,17 @@
return a[0];
}
+int test14(int *a, int b) {
+ a = (int *)__builtin_assume_aligned(b, 32); // expected-error {{incompatible integer to pointer conversion passing 'int' to parameter of type 'const void *}}
+ return a[0];
+}
+
+int test15(int *b) {
+ int arr[3] = {1, 2, 3};
+ b = (int *)__builtin_assume_aligned(arr, 32);
+ return b[0];
+}
+
void test_void_assume_aligned(void) __attribute__((assume_aligned(32))); // expected-warning {{'assume_aligned' attribute only applies to return values that are pointers}}
int test_int_assume_aligned(void) __attribute__((assume_aligned(16))); // expected-warning {{'assume_aligned' attribute only applies to return values that are pointers}}
void *test_ptr_assume_aligned(void) __attribute__((assume_aligned(64))); // no-warning
Index: clang/lib/Sema/SemaChecking.cpp
===================================================================
--- clang/lib/Sema/SemaChecking.cpp
+++ clang/lib/Sema/SemaChecking.cpp
@@ -7981,6 +7981,15 @@
DefaultFunctionArrayLvalueConversion(FirstArg);
if (FirstArgResult.isInvalid())
return true;
+ QualType FirstArgType = FirstArgResult.get()->getType();
+
+ if (checkBuiltinArgument(*this, TheCall, 0)) {
+ const QualType &ConstVoidPointerType =
+ Context.getPointerType(Context.VoidTy.withConst());
+ return Diag(FirstArg->getBeginLoc(),
+ diag::err_typecheck_convert_incompatible)
+ << FirstArgType << ConstVoidPointerType << 1 << 0 << 0;
+ }
TheCall->setArg(0, FirstArgResult.get());
}
Index: clang/docs/ReleaseNotes.rst
===================================================================
--- clang/docs/ReleaseNotes.rst
+++ clang/docs/ReleaseNotes.rst
@@ -338,6 +338,9 @@
- Fix crash when attempting to perform parenthesized initialization of an
aggregate with a base class with only non-public constructors.
(`#62296 <https://github.com/llvm/llvm-project/issues/62296>`_)
+- Fix crash when attempting to pass a non-pointer type as first argument of
+ ``__builtin_assume_aligned``.
+ (`#62305 <https://github.com/llvm/llvm-project/issues/62305>`)
Bug Fixes to Compiler Builtins
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
