From fbbae9ea2bd1c89e39deb62c8a2f549a33e51fae Mon Sep 17 00:00:00 2001 From: Weining Lu Date: Fri, 30 May 2025 10:27:06 +0800 Subject: [PATCH] [LoongArch] Only report the first range error if there is actually more than one for __builtin_loongarch_cacop_[wd] Other builtins do the same. Align with them. --- clang/lib/Sema/SemaLoongArch.cpp | 7 +++---- clang/test/CodeGen/LoongArch/intrinsic-la32-error.c | 3 ++- clang/test/CodeGen/LoongArch/intrinsic-la64-error.c | 6 ++++++ 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/clang/lib/Sema/SemaLoongArch.cpp b/clang/lib/Sema/SemaLoongArch.cpp index 0a67bf2c7738..c57a6f91a3df 100644 --- a/clang/lib/Sema/SemaLoongArch.cpp +++ b/clang/lib/Sema/SemaLoongArch.cpp @@ -28,10 +28,9 @@ bool SemaLoongArch::CheckLoongArchBuiltinFunctionCall(const TargetInfo &TI, // Basic intrinsics. case LoongArch::BI__builtin_loongarch_cacop_d: case LoongArch::BI__builtin_loongarch_cacop_w: { - SemaRef.BuiltinConstantArgRange(TheCall, 0, 0, llvm::maxUIntN(5)); - SemaRef.BuiltinConstantArgRange(TheCall, 2, llvm::minIntN(12), - llvm::maxIntN(12)); - break; + return SemaRef.BuiltinConstantArgRange(TheCall, 0, 0, llvm::maxUIntN(5)) || + SemaRef.BuiltinConstantArgRange(TheCall, 2, llvm::minIntN(12), + llvm::maxIntN(12)); } case LoongArch::BI__builtin_loongarch_break: case LoongArch::BI__builtin_loongarch_dbar: diff --git a/clang/test/CodeGen/LoongArch/intrinsic-la32-error.c b/clang/test/CodeGen/LoongArch/intrinsic-la32-error.c index 90aa35a32e2c..89ce0052214e 100644 --- a/clang/test/CodeGen/LoongArch/intrinsic-la32-error.c +++ b/clang/test/CodeGen/LoongArch/intrinsic-la32-error.c @@ -52,11 +52,12 @@ void test_feature(long *v_l, unsigned long *v_ul, int *v_i, unsigned ui, char c, } #endif -void cacop_d(unsigned long int a) { +void cacop_w(unsigned long int a) { __builtin_loongarch_cacop_w(-1, a, 1024); // expected-error {{argument value -1 is outside the valid range [0, 31]}} __builtin_loongarch_cacop_w(32, a, 1024); // expected-error {{argument value 32 is outside the valid range [0, 31]}} __builtin_loongarch_cacop_w(1, a, -4096); // expected-error {{argument value -4096 is outside the valid range [-2048, 2047]}} __builtin_loongarch_cacop_w(1, a, 4096); // expected-error {{argument value 4096 is outside the valid range [-2048, 2047]}} + __builtin_loongarch_cacop_w(-2, a, 5000); // expected-error {{argument value -2 is outside the valid range [0, 31]}} } void dbar(int a) { diff --git a/clang/test/CodeGen/LoongArch/intrinsic-la64-error.c b/clang/test/CodeGen/LoongArch/intrinsic-la64-error.c index 3b33d954f8e4..085f3fdc89ba 100644 --- a/clang/test/CodeGen/LoongArch/intrinsic-la64-error.c +++ b/clang/test/CodeGen/LoongArch/intrinsic-la64-error.c @@ -23,6 +23,12 @@ void test_feature(unsigned long *v_ul, int *v_i, float a, double b) { } #endif +void cacop_d(int a) { + __builtin_loongarch_cacop_d(-1, a, 0); // expected-error {{argument value -1 is outside the valid range [0, 31]}} + __builtin_loongarch_cacop_d(1, a, 4000); // expected-error {{argument value 4000 is outside the valid range [-2048, 2047]}} + __builtin_loongarch_cacop_d(-2, a, 5000); // expected-error {{argument value -2 is outside the valid range [0, 31]}} +} + void csrrd_d(int a) { __builtin_loongarch_csrrd_d(16384); // expected-error {{argument value 16384 is outside the valid range [0, 16383]}} __builtin_loongarch_csrrd_d(-1); // expected-error {{argument value 4294967295 is outside the valid range [0, 16383]}}