sdesmalen created this revision.
Herald added subscribers: psnobl, kristof.beyls, tschuett.
Herald added a reviewer: efriedma.
sdesmalen requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
This fixes a subtle issue where:
svprf(pg, ptr, SV_ALL /*is sv_pattern instead of sv_prfop*/)
would be quietly accepted. With this change, the function declaration
guards that the third parameter is a `enum sv_prfop`. Previously `svprf`
would map directly to `__builtin_sve_svprfb`, which accepts the enum
operand as a signed integer and only checks that the incoming range is
valid, meaning that SV_ALL would be discarded as being outside the valid
immediate range, but would have allowed SV_VL1 without issuing a warning
(C) or error (C++).
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D100297
Files:
clang/test/CodeGen/aarch64-sve-intrinsics/negative/acle_sve_prfb.c
clang/test/CodeGen/aarch64-sve-intrinsics/negative/acle_sve_qdecb.c
clang/utils/TableGen/SveEmitter.cpp
Index: clang/utils/TableGen/SveEmitter.cpp
===================================================================
--- clang/utils/TableGen/SveEmitter.cpp
+++ clang/utils/TableGen/SveEmitter.cpp
@@ -919,26 +919,22 @@
}
void Intrinsic::emitIntrinsic(raw_ostream &OS) const {
- // Use the preprocessor to
- if (getClassKind() != ClassG || getProto().size() <= 1) {
- OS << "#define " << mangleName(getClassKind())
- << "(...) __builtin_sve_" << mangleName(ClassS)
- << "(__VA_ARGS__)\n";
- } else {
- std::string FullName = mangleName(ClassS);
- std::string ProtoName = mangleName(ClassG);
+ bool IsOverloaded = getClassKind() == ClassG && getProto().size() > 1;
- OS << "__aio __attribute__((__clang_arm_builtin_alias("
- << "__builtin_sve_" << FullName << ")))\n";
+ std::string FullName = mangleName(ClassS);
+ std::string ProtoName = mangleName(getClassKind());
- OS << getTypes()[0].str() << " " << ProtoName << "(";
- for (unsigned I = 0; I < getTypes().size() - 1; ++I) {
- if (I != 0)
- OS << ", ";
- OS << getTypes()[I + 1].str();
- }
- OS << ");\n";
+ OS << (IsOverloaded ? "__aio " : "__ai ")
+ << "__attribute__((__clang_arm_builtin_alias("
+ << "__builtin_sve_" << FullName << ")))\n";
+
+ OS << getTypes()[0].str() << " " << ProtoName << "(";
+ for (unsigned I = 0; I < getTypes().size() - 1; ++I) {
+ if (I != 0)
+ OS << ", ";
+ OS << getTypes()[I + 1].str();
}
+ OS << ");\n";
}
//===----------------------------------------------------------------------===//
@@ -1204,6 +1200,8 @@
OS << "};\n\n";
OS << "/* Function attributes */\n";
+ OS << "#define __ai static __inline__ __attribute__((__always_inline__, "
+ "__nodebug__))\n\n";
OS << "#define __aio static __inline__ __attribute__((__always_inline__, "
"__nodebug__, __overloadable__))\n\n";
Index: clang/test/CodeGen/aarch64-sve-intrinsics/negative/acle_sve_qdecb.c
===================================================================
--- clang/test/CodeGen/aarch64-sve-intrinsics/negative/acle_sve_qdecb.c
+++ clang/test/CodeGen/aarch64-sve-intrinsics/negative/acle_sve_qdecb.c
@@ -105,3 +105,9 @@
// expected-error-re@+1 {{argument value {{[0-9]+}} is outside the valid
range [1, 16]}}
return SVE_ACLE_FUNC(svqdecb_pat,_n_u64,,)(op, SV_VL7, 17);
}
+
+uint64_t test_svqdecb_svprfop(uint64_t op)
+{
+ // expected-warning@+1 {{implicit conversion from enumeration type 'enum
svprfop' to different enumeration type 'enum svpattern'}}
+ return SVE_ACLE_FUNC(svqdecb_pat,_n_u64,,)(op, SV_PLDL1KEEP, 1);
+}
Index: clang/test/CodeGen/aarch64-sve-intrinsics/negative/acle_sve_prfb.c
===================================================================
--- clang/test/CodeGen/aarch64-sve-intrinsics/negative/acle_sve_prfb.c
+++ clang/test/CodeGen/aarch64-sve-intrinsics/negative/acle_sve_prfb.c
@@ -25,3 +25,9 @@
// expected-error-re@+1 {{argument value {{.*}} is outside the valid range
[0, 13]}}
return svprfb_vnum(pg, base, 0, -1);
}
+
+void test_svprfb_svpattern(svbool_t pg, const void *base)
+{
+ // expected-warning@+1 {{implicit conversion from enumeration type 'enum
svpattern' to different enumeration type 'enum svprfop'}}
+ return svprfb(pg, base, SV_VL1);
+}
Index: clang/utils/TableGen/SveEmitter.cpp
===================================================================
--- clang/utils/TableGen/SveEmitter.cpp
+++ clang/utils/TableGen/SveEmitter.cpp
@@ -919,26 +919,22 @@
}
void Intrinsic::emitIntrinsic(raw_ostream &OS) const {
- // Use the preprocessor to
- if (getClassKind() != ClassG || getProto().size() <= 1) {
- OS << "#define " << mangleName(getClassKind())
- << "(...) __builtin_sve_" << mangleName(ClassS)
- << "(__VA_ARGS__)\n";
- } else {
- std::string FullName = mangleName(ClassS);
- std::string ProtoName = mangleName(ClassG);
+ bool IsOverloaded = getClassKind() == ClassG && getProto().size() > 1;
- OS << "__aio __attribute__((__clang_arm_builtin_alias("
- << "__builtin_sve_" << FullName << ")))\n";
+ std::string FullName = mangleName(ClassS);
+ std::string ProtoName = mangleName(getClassKind());
- OS << getTypes()[0].str() << " " << ProtoName << "(";
- for (unsigned I = 0; I < getTypes().size() - 1; ++I) {
- if (I != 0)
- OS << ", ";
- OS << getTypes()[I + 1].str();
- }
- OS << ");\n";
+ OS << (IsOverloaded ? "__aio " : "__ai ")
+ << "__attribute__((__clang_arm_builtin_alias("
+ << "__builtin_sve_" << FullName << ")))\n";
+
+ OS << getTypes()[0].str() << " " << ProtoName << "(";
+ for (unsigned I = 0; I < getTypes().size() - 1; ++I) {
+ if (I != 0)
+ OS << ", ";
+ OS << getTypes()[I + 1].str();
}
+ OS << ");\n";
}
//===----------------------------------------------------------------------===//
@@ -1204,6 +1200,8 @@
OS << "};\n\n";
OS << "/* Function attributes */\n";
+ OS << "#define __ai static __inline__ __attribute__((__always_inline__, "
+ "__nodebug__))\n\n";
OS << "#define __aio static __inline__ __attribute__((__always_inline__, "
"__nodebug__, __overloadable__))\n\n";
Index: clang/test/CodeGen/aarch64-sve-intrinsics/negative/acle_sve_qdecb.c
===================================================================
--- clang/test/CodeGen/aarch64-sve-intrinsics/negative/acle_sve_qdecb.c
+++ clang/test/CodeGen/aarch64-sve-intrinsics/negative/acle_sve_qdecb.c
@@ -105,3 +105,9 @@
// expected-error-re@+1 {{argument value {{[0-9]+}} is outside the valid range [1, 16]}}
return SVE_ACLE_FUNC(svqdecb_pat,_n_u64,,)(op, SV_VL7, 17);
}
+
+uint64_t test_svqdecb_svprfop(uint64_t op)
+{
+ // expected-warning@+1 {{implicit conversion from enumeration type 'enum svprfop' to different enumeration type 'enum svpattern'}}
+ return SVE_ACLE_FUNC(svqdecb_pat,_n_u64,,)(op, SV_PLDL1KEEP, 1);
+}
Index: clang/test/CodeGen/aarch64-sve-intrinsics/negative/acle_sve_prfb.c
===================================================================
--- clang/test/CodeGen/aarch64-sve-intrinsics/negative/acle_sve_prfb.c
+++ clang/test/CodeGen/aarch64-sve-intrinsics/negative/acle_sve_prfb.c
@@ -25,3 +25,9 @@
// expected-error-re@+1 {{argument value {{.*}} is outside the valid range [0, 13]}}
return svprfb_vnum(pg, base, 0, -1);
}
+
+void test_svprfb_svpattern(svbool_t pg, const void *base)
+{
+ // expected-warning@+1 {{implicit conversion from enumeration type 'enum svpattern' to different enumeration type 'enum svprfop'}}
+ return svprfb(pg, base, SV_VL1);
+}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
