llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-clang
<details>
<summary>Changes</summary>
Hashing the sugared type instead of the canonical type meant that
a simple example like this would always fail under MSVC:
```
static auto l() {}
int main() {
auto a = l;
a();
}
```
`clang --target=x86_64-pc-windows-msvc -fno-exceptions -fsanitize=function -g
-O0 -fuse-ld=lld -o test.exe test.cc`
produces:
```
test.cc:4:3: runtime error: call to function l through pointer to incorrect
function type 'void (*)()'
```
---
Full diff: https://github.com/llvm/llvm-project/pull/66816.diff
3 Files Affected:
- (modified) clang/lib/CodeGen/CodeGenFunction.cpp (+1)
- (added) clang/test/CodeGen/ubsan-function-sugared.cpp (+43)
- (modified) clang/test/CodeGen/ubsan-function.cpp (+13-8)
``````````diff
diff --git a/clang/lib/CodeGen/CodeGenFunction.cpp
b/clang/lib/CodeGen/CodeGenFunction.cpp
index bf83171e2c68146..78b3faa970be96b 100644
--- a/clang/lib/CodeGen/CodeGenFunction.cpp
+++ b/clang/lib/CodeGen/CodeGenFunction.cpp
@@ -570,6 +570,7 @@ bool CodeGenFunction::AlwaysEmitXRayTypedEvents() const {
llvm::ConstantInt *
CodeGenFunction::getUBSanFunctionTypeHash(QualType Ty) const {
+ Ty = Ty.getCanonicalType();
// Remove any (C++17) exception specifications, to allow calling e.g. a
// noexcept function through a non-noexcept pointer.
if (!Ty->isFunctionNoProtoType())
diff --git a/clang/test/CodeGen/ubsan-function-sugared.cpp
b/clang/test/CodeGen/ubsan-function-sugared.cpp
new file mode 100644
index 000000000000000..fb2487c024ba903
--- /dev/null
+++ b/clang/test/CodeGen/ubsan-function-sugared.cpp
@@ -0,0 +1,43 @@
+// RUN: %clang_cc1 -triple x86_64-linux-gnu -emit-llvm -o - %s
-fsanitize=function -fno-sanitize-recover=all | FileCheck %s
--check-prefixes=CHECK,GNU,64
+// RUN: %clang_cc1 -triple x86_64-pc-windows-msvc -emit-llvm -o - %s
-fsanitize=function -fno-sanitize-recover=all | FileCheck %s
--check-prefixes=CHECK,MSVC,64
+// RUN: %clang_cc1 -triple aarch64-linux-gnu -emit-llvm -o - %s
-fsanitize=function -fno-sanitize-recover=all | FileCheck %s
--check-prefixes=CHECK,GNU,64
+// RUN: %clang_cc1 -triple aarch64_be-linux-gnu -emit-llvm -o - %s
-fsanitize=function -fno-sanitize-recover=all | FileCheck %s
--check-prefixes=CHECK,GNU,64
+// RUN: %clang_cc1 -triple arm-none-eabi -emit-llvm -o - %s
-fsanitize=function -fno-sanitize-recover=all | FileCheck %s
--check-prefixes=CHECK,ARM,GNU,32
+
+// GNU: define{{.*}} void @_Z3funv() #0 !func_sanitize ![[FUNCSAN:.*]] {
+// MSVC: define{{.*}} void @"?fun@@YA?A?<auto>@@XZ"() #0 !func_sanitize
![[FUNCSAN:.*]] {
+auto fun() {}
+
+// GNU-LABEL: define{{.*}} void @_Z6callerv()
+// MSVC-LABEL: define{{.*}} void @"?caller@@YAXXZ"()
+// ARM: ptrtoint ptr {{.*}} to i32, !nosanitize !4
+// ARM: and i32 {{.*}}, -2, !nosanitize !4
+// ARM: inttoptr i32 {{.*}} to ptr, !nosanitize !4
+// CHECK: getelementptr <{ i32, i32 }>, ptr {{.*}}, i32 -1, i32 0, !nosanitize
+// CHECK: load i32, ptr {{.*}}, align {{.*}}, !nosanitize
+// CHECK: icmp eq i32 {{.*}}, -1056584962, !nosanitize
+// CHECK: br i1 {{.*}}, label %[[LABEL1:.*]], label %[[LABEL4:.*]], !nosanitize
+// CHECK: [[LABEL1]]:
+// CHECK: getelementptr <{ i32, i32 }>, ptr {{.*}}, i32 -1, i32 1, !nosanitize
+// CHECK: load i32, ptr {{.*}}, align {{.*}}, !nosanitize
+// GNU: icmp eq i32 {{.*}}, 905068220, !nosanitize
+// MSVC: icmp eq i32 {{.*}}, -1600339357, !nosanitize
+// CHECK: br i1 {{.*}}, label %[[LABEL3:.*]], label %[[LABEL2:[^,]*]],
{{.*}}!nosanitize
+// CHECK: [[LABEL2]]:
+// 64: call void @__ubsan_handle_function_type_mismatch_abort(ptr @[[#]],
i64 %[[#]]) #[[#]], !nosanitize
+// 32: call void @__ubsan_handle_function_type_mismatch_abort(ptr @[[#]],
i32 %[[#]]) #[[#]], !nosanitize
+// CHECK-NEXT: unreachable, !nosanitize
+// CHECK-EMPTY:
+// CHECK-NEXT: [[LABEL3]]:
+// CHECK: br label %[[LABEL4]], !nosanitize
+// CHECK-EMPTY:
+// CHECK-NEXT: [[LABEL4]]:
+// CHECK-NEXT: call void
+// CHECK-NEXT: ret void
+void caller() {
+ auto a = fun;
+ a();
+}
+
+// GNU: ![[FUNCSAN]] = !{i32 -1056584962, i32 905068220}
+// MSVC: ![[FUNCSAN]] = !{i32 -1056584962, i32 -1600339357}
diff --git a/clang/test/CodeGen/ubsan-function.cpp
b/clang/test/CodeGen/ubsan-function.cpp
index 1c281c8544578fe..bc37a61c98ee3ae 100644
--- a/clang/test/CodeGen/ubsan-function.cpp
+++ b/clang/test/CodeGen/ubsan-function.cpp
@@ -1,12 +1,15 @@
-// RUN: %clang_cc1 -triple x86_64-linux-gnu -emit-llvm -o - %s
-fsanitize=function -fno-sanitize-recover=all | FileCheck %s
--check-prefixes=CHECK,64
-// RUN: %clang_cc1 -triple aarch64-linux-gnu -emit-llvm -o - %s
-fsanitize=function -fno-sanitize-recover=all | FileCheck %s
--check-prefixes=CHECK,64
-// RUN: %clang_cc1 -triple aarch64_be-linux-gnu -emit-llvm -o - %s
-fsanitize=function -fno-sanitize-recover=all | FileCheck %s
--check-prefixes=CHECK,64
-// RUN: %clang_cc1 -triple arm-none-eabi -emit-llvm -o - %s
-fsanitize=function -fno-sanitize-recover=all | FileCheck %s
--check-prefixes=CHECK,ARM,32
+// RUN: %clang_cc1 -triple x86_64-linux-gnu -emit-llvm -o - %s
-fsanitize=function -fno-sanitize-recover=all | FileCheck %s
--check-prefixes=CHECK,GNU,64
+// RUN: %clang_cc1 -triple x86_64-pc-windows-msvc -emit-llvm -o - %s
-fsanitize=function -fno-sanitize-recover=all | FileCheck %s
--check-prefixes=CHECK,MSVC,64
+// RUN: %clang_cc1 -triple aarch64-linux-gnu -emit-llvm -o - %s
-fsanitize=function -fno-sanitize-recover=all | FileCheck %s
--check-prefixes=CHECK,GNU,64
+// RUN: %clang_cc1 -triple aarch64_be-linux-gnu -emit-llvm -o - %s
-fsanitize=function -fno-sanitize-recover=all | FileCheck %s
--check-prefixes=CHECK,GNU,64
+// RUN: %clang_cc1 -triple arm-none-eabi -emit-llvm -o - %s
-fsanitize=function -fno-sanitize-recover=all | FileCheck %s
--check-prefixes=CHECK,ARM,GNU,32
-// CHECK: define{{.*}} void @_Z3funv() #0 !func_sanitize ![[FUNCSAN:.*]] {
+// GNU: define{{.*}} void @_Z3funv() #0 !func_sanitize ![[FUNCSAN:.*]] {
+// MSVC: define{{.*}} void @"?fun@@YAXXZ"() #0 !func_sanitize ![[FUNCSAN:.*]] {
void fun() {}
-// CHECK-LABEL: define{{.*}} void @_Z6callerPFvvE(ptr noundef %f)
+// GNU-LABEL: define{{.*}} void @_Z6callerPFvvE(ptr noundef %f)
+// MSVC-LABEL: define{{.*}} void @"?caller@@YAXP6AXXZ@Z"(ptr noundef %f)
// ARM: ptrtoint ptr {{.*}} to i32, !nosanitize !5
// ARM: and i32 {{.*}}, -2, !nosanitize !5
// ARM: inttoptr i32 {{.*}} to ptr, !nosanitize !5
@@ -17,7 +20,8 @@ void fun() {}
// CHECK: [[LABEL1]]:
// CHECK: getelementptr <{ i32, i32 }>, ptr {{.*}}, i32 -1, i32 1, !nosanitize
// CHECK: load i32, ptr {{.*}}, align {{.*}}, !nosanitize
-// CHECK: icmp eq i32 {{.*}}, 905068220, !nosanitize
+// GNU: icmp eq i32 {{.*}}, 905068220, !nosanitize
+// MSVC: icmp eq i32 {{.*}}, -1600339357, !nosanitize
// CHECK: br i1 {{.*}}, label %[[LABEL3:.*]], label %[[LABEL2:[^,]*]],
{{.*}}!nosanitize
// CHECK: [[LABEL2]]:
// 64: call void @__ubsan_handle_function_type_mismatch_abort(ptr @[[#]],
i64 %[[#]]) #[[#]], !nosanitize
@@ -32,4 +36,5 @@ void fun() {}
// CHECK-NEXT: ret void
void caller(void (*f)()) { f(); }
-// CHECK: ![[FUNCSAN]] = !{i32 -1056584962, i32 905068220}
+// GNU: ![[FUNCSAN]] = !{i32 -1056584962, i32 905068220}
+// MSVC: ![[FUNCSAN]] = !{i32 -1056584962, i32 -1600339357}
``````````
</details>
https://github.com/llvm/llvm-project/pull/66816
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
