Author: Rishabh Bali Date: 2023-05-05T13:11:16-04:00 New Revision: 0b3d737877040a4eae03e47223f9a9ddfd7bd182
URL: https://github.com/llvm/llvm-project/commit/0b3d737877040a4eae03e47223f9a9ddfd7bd182 DIFF: https://github.com/llvm/llvm-project/commit/0b3d737877040a4eae03e47223f9a9ddfd7bd182.diff LOG: Check if First argument in _builtin_assume_aligned_ is of pointer type Currently clang doesn't verify if the first argument in `_builtin_assume_aligned` is of pointer type. This leads to an assertion build failure. This patch aims to add a check if the first argument is of pointer type or not and diagnose it with diag::err_typecheck_convert_incompatible if its not of pointer type. Fixes https://github.com/llvm/llvm-project/issues/62305 Differential Revision: https://reviews.llvm.org/D149514 Added: Modified: clang/docs/ReleaseNotes.rst clang/lib/CodeGen/CGBuiltin.cpp clang/lib/Sema/SemaChecking.cpp clang/test/Sema/builtin-assume-aligned.c Removed: ################################################################################ diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst index a41917a5ed66a..910a853eafc81 100644 --- a/clang/docs/ReleaseNotes.rst +++ b/clang/docs/ReleaseNotes.rst @@ -368,6 +368,9 @@ Bug Fixes in This Version (`#62207 <https://github.com/llvm/llvm-project/issues/62207>`_) - Fix lambdas and other anonymous function names not respecting ``-fdebug-prefix-map`` (`#62192 <https://github.com/llvm/llvm-project/issues/62192>`_) +- 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 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/clang/lib/CodeGen/CGBuiltin.cpp b/clang/lib/CodeGen/CGBuiltin.cpp index 5952ac4ff5ac4..03d6574ef3bcf 100644 --- a/clang/lib/CodeGen/CGBuiltin.cpp +++ b/clang/lib/CodeGen/CGBuiltin.cpp @@ -2829,8 +2829,6 @@ RValue CodeGenFunction::EmitBuiltinExpr(const GlobalDecl GD, unsigned BuiltinID, case Builtin::BI__builtin_assume_aligned: { const Expr *Ptr = E->getArg(0); Value *PtrValue = EmitScalarExpr(Ptr); - if (PtrValue->getType() != VoidPtrTy) - PtrValue = EmitCastToVoidPtr(PtrValue); Value *OffsetValue = (E->getNumArgs() > 2) ? EmitScalarExpr(E->getArg(2)) : nullptr; diff --git a/clang/lib/Sema/SemaChecking.cpp b/clang/lib/Sema/SemaChecking.cpp index 63c5b25b27262..a759cf30eeafd 100644 --- a/clang/lib/Sema/SemaChecking.cpp +++ b/clang/lib/Sema/SemaChecking.cpp @@ -8100,8 +8100,9 @@ bool Sema::SemaBuiltinAssumeAligned(CallExpr *TheCall) { { ExprResult FirstArgResult = DefaultFunctionArrayLvalueConversion(FirstArg); - if (FirstArgResult.isInvalid()) + if (checkBuiltinArgument(*this, TheCall, 0)) return true; + /// In-place updation of FirstArg by checkBuiltinArgument is ignored. TheCall->setArg(0, FirstArgResult.get()); } diff --git a/clang/test/Sema/builtin-assume-aligned.c b/clang/test/Sema/builtin-assume-aligned.c index a5dd7e387181e..c2e4f9d659dd4 100644 --- a/clang/test/Sema/builtin-assume-aligned.c +++ b/clang/test/Sema/builtin-assume-aligned.c @@ -71,6 +71,25 @@ int test13(int *a) { 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 *}} +} + +int test15(int *b) { + int arr[3] = {1, 2, 3}; + b = (int *)__builtin_assume_aligned(arr, 32); + return b[0]; +} + +int val(int x) { + return x; +} + +int test16(int *b) { + b = (int *)__builtin_assume_aligned(val, 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 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
