Author: Nico Weber Date: 2023-02-02T08:59:27-05:00 New Revision: adf7ffd51ee34c3a72d3168f5aed8b946ba3d2cc
URL: https://github.com/llvm/llvm-project/commit/adf7ffd51ee34c3a72d3168f5aed8b946ba3d2cc DIFF: https://github.com/llvm/llvm-project/commit/adf7ffd51ee34c3a72d3168f5aed8b946ba3d2cc.diff LOG: Revert "[Clang] Add builtin_nondeterministic_value" This reverts commit 4a1832a5c801a61bf4c30891aaebe63993712fd9. Test fail on (at least) macOS and Windows, see https://reviews.llvm.org/D142388#4099441 Added: Modified: clang/docs/LanguageExtensions.rst clang/docs/ReleaseNotes.rst clang/include/clang/Basic/Builtins.def clang/include/clang/Sema/Sema.h clang/lib/CodeGen/CGBuiltin.cpp clang/lib/Sema/SemaChecking.cpp Removed: clang/test/CodeGen/builtins-nondeterministic-value.c ################################################################################ diff --git a/clang/docs/LanguageExtensions.rst b/clang/docs/LanguageExtensions.rst index d3a8d958dc7ca..0b533a2ff7596 100644 --- a/clang/docs/LanguageExtensions.rst +++ b/clang/docs/LanguageExtensions.rst @@ -3080,32 +3080,6 @@ Query for this feature with ``__has_builtin(__builtin_debugtrap)``. Query for this feature with ``__has_builtin(__builtin_trap)``. -``__builtin_nondeterministic_value`` ------------------------------------- - -``__builtin_nondeterministic_value`` returns a valid nondeterministic value of the same type as the provided argument. - -**Syntax**: - -.. code-block:: c++ - - type __builtin_nondeterministic_value(type x) - -**Examples**: - -.. code-block:: c++ - - int x = __builtin_nondeterministic_value(x); - float y = __builtin_nondeterministic_value(y); - __m256i a = __builtin_nondeterministic_value(a); - -**Description** - -Each call to ``__builtin_nondeterministic_value`` returns a valid value of the type given by the argument. - -The types currently supported are: integer types, floating-point types, vector types. - -Query for this feature with ``__has_builtin(__builtin_nondeterministic_value)``. ``__builtin_sycl_unique_stable_name`` ------------------------------------- diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst index 5f0f3247cf77d..9cc2a72f4c864 100644 --- a/clang/docs/ReleaseNotes.rst +++ b/clang/docs/ReleaseNotes.rst @@ -72,8 +72,6 @@ Non-comprehensive list of changes in this release - Clang now saves the address of ABI-indirect function parameters on the stack, improving the debug information available in programs compiled without optimizations. -- Clang now supports ``__builtin_nondeterministic_value`` that returns a - nondeterministic value of the same type as the provided argument. New Compiler Flags ------------------ diff --git a/clang/include/clang/Basic/Builtins.def b/clang/include/clang/Basic/Builtins.def index f401a6b4c62b2..6b54ff7c40e82 100644 --- a/clang/include/clang/Basic/Builtins.def +++ b/clang/include/clang/Basic/Builtins.def @@ -655,7 +655,6 @@ BUILTIN(__builtin_alloca_uninitialized, "v*z", "Fn") BUILTIN(__builtin_alloca_with_align, "v*zIz", "Fn") BUILTIN(__builtin_alloca_with_align_uninitialized, "v*zIz", "Fn") BUILTIN(__builtin_call_with_static_chain, "v.", "nt") -BUILTIN(__builtin_nondeterministic_value, "v.", "nt") BUILTIN(__builtin_elementwise_abs, "v.", "nct") BUILTIN(__builtin_elementwise_max, "v.", "nct") diff --git a/clang/include/clang/Sema/Sema.h b/clang/include/clang/Sema/Sema.h index 67d55ab3d8c6d..741c2503127af 100644 --- a/clang/include/clang/Sema/Sema.h +++ b/clang/include/clang/Sema/Sema.h @@ -13571,8 +13571,6 @@ class Sema final { bool PrepareBuiltinElementwiseMathOneArgCall(CallExpr *TheCall); bool PrepareBuiltinReduceMathOneArgCall(CallExpr *TheCall); - bool SemaBuiltinNonDeterministicValue(CallExpr *TheCall); - // Matrix builtin handling. ExprResult SemaBuiltinMatrixTranspose(CallExpr *TheCall, ExprResult CallResult); diff --git a/clang/lib/CodeGen/CGBuiltin.cpp b/clang/lib/CodeGen/CGBuiltin.cpp index 4a8ca1f918442..bf1c9acc7bec7 100644 --- a/clang/lib/CodeGen/CGBuiltin.cpp +++ b/clang/lib/CodeGen/CGBuiltin.cpp @@ -3060,15 +3060,6 @@ RValue CodeGenFunction::EmitBuiltinExpr(const GlobalDecl GD, unsigned BuiltinID, return RValue::get(V); } - case Builtin::BI__builtin_nondeterministic_value: { - llvm::Type *Ty = ConvertType(E->getArg(0)->getType()); - - Value *Result = PoisonValue::get(Ty); - Result = Builder.CreateFreeze(Result); - - return RValue::get(Result); - } - case Builtin::BI__builtin_elementwise_abs: { Value *Result; QualType QT = E->getArg(0)->getType(); diff --git a/clang/lib/Sema/SemaChecking.cpp b/clang/lib/Sema/SemaChecking.cpp index 2618b0cd64b20..4602284309491 100644 --- a/clang/lib/Sema/SemaChecking.cpp +++ b/clang/lib/Sema/SemaChecking.cpp @@ -2584,12 +2584,6 @@ Sema::CheckBuiltinFunctionCall(FunctionDecl *FDecl, unsigned BuiltinID, break; } - case Builtin::BI__builtin_nondeterministic_value: { - if (SemaBuiltinNonDeterministicValue(TheCall)) - return ExprError(); - break; - } - // __builtin_elementwise_abs restricts the element type to signed integers or // floating point types only. case Builtin::BI__builtin_elementwise_abs: { @@ -17863,21 +17857,6 @@ bool Sema::PrepareBuiltinReduceMathOneArgCall(CallExpr *TheCall) { return false; } -bool Sema::SemaBuiltinNonDeterministicValue(CallExpr *TheCall) { - if (checkArgCount(*this, TheCall, 1)) - return true; - - ExprResult Arg = TheCall->getArg(0); - QualType TyArg = Arg.get()->getType(); - - if (!TyArg->isBuiltinType() && !TyArg->isVectorType()) - return Diag(TheCall->getArg(0)->getBeginLoc(), diag::err_builtin_invalid_arg_type) - << 1 << /*vector, integer or floating point ty*/ 0 << TyArg; - - TheCall->setType(TyArg); - return false; -} - ExprResult Sema::SemaBuiltinMatrixTranspose(CallExpr *TheCall, ExprResult CallResult) { if (checkArgCount(*this, TheCall, 1)) diff --git a/clang/test/CodeGen/builtins-nondeterministic-value.c b/clang/test/CodeGen/builtins-nondeterministic-value.c deleted file mode 100644 index 0648c1080227e..0000000000000 --- a/clang/test/CodeGen/builtins-nondeterministic-value.c +++ /dev/null @@ -1,58 +0,0 @@ -// RUN: %clang_cc1 %s -emit-llvm -o - | FileCheck %s - -typedef float float4 __attribute__((ext_vector_type(4))); -typedef _Bool bool4 __attribute__((ext_vector_type(4))); - -int clang_nondet_i( int x ) { -// CHECK-LABEL: entry -// CHECK: [[A:%.*]] = alloca i32, align 4 -// CHECK: store i32 [[X:%.*]], ptr [[A]], align 4 -// CHECK: [[R:%.*]] = freeze i32 poison -// CHECK: ret i32 [[R]] - return __builtin_nondeterministic_value(x); -} - -float clang_nondet_f( float x ) { -// CHECK-LABEL: entry -// CHECK: [[A:%.*]] = alloca float, align 4 -// CHECK: store float [[X:%.*]], ptr [[A]], align 4 -// CHECK: [[R:%.*]] = freeze float poison -// CHECK: ret float [[R]] - return __builtin_nondeterministic_value(x); -} - -double clang_nondet_d( double x ) { -// CHECK-LABEL: entry -// CHECK: [[A:%.*]] = alloca double, align 8 -// CHECK: store double [[X:%.*]], ptr [[A]], align 8 -// CHECK: [[R:%.*]] = freeze double poison -// CHECK: ret double [[R]] - return __builtin_nondeterministic_value(x); -} - -_Bool clang_nondet_b( _Bool x) { -// CHECK-LABEL: entry -// CHECK: [[A:%.*]] = alloca i8, align 1 -// CHECK: [[B:%.*]] = zext i1 %x to i8 -// CHECK: store i8 [[B]], ptr [[A]], align 1 -// CHECK: [[R:%.*]] = freeze i1 poison -// CHECK: ret i1 [[R]] - return __builtin_nondeterministic_value(x); -} - -float4 clang_nondet_fv( float4 x ) { -// CHECK-LABEL: entry -// CHECK: [[A:%.*]] = alloca <4 x float>, align 16 -// CHECK: store <4 x float> [[X:%.*]], ptr [[A]], align 16 -// CHECK: [[R:%.*]] = freeze <4 x float> poison -// CHECK: ret <4 x float> [[R]] - return __builtin_nondeterministic_value(x); -} - -bool4 clang_nondet_bv( bool4 x ) { -// CHECK: [[V:%.*]] = freeze <4 x i1> poison -// CHECK: store <4 x i1> [[V]], ptr [[P:%.*]], align 1 -// CHECK: [[R:%.*]] = load i8, ptr [[P]], align 1 -// CHECK: ret i8 [[R]] - return __builtin_nondeterministic_value(x); -} \ No newline at end of file _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
