-
Notifications
You must be signed in to change notification settings - Fork 14.9k
[libc][annex_k] Add libc_constraint_handler macros. #163316
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
Warning This pull request is not mergeable via GitHub because a downstack PR is open. Once all requirements are satisfied, merge this PR as a stack on Graphite.
This stack of pull requests is managed by Graphite. Learn more about stacking. |
@llvm/pr-subscribers-libc Author: Muhammad Bassiouni (bassiounix) ChangesRFC https://discourse.llvm.org/t/rfc-bounds-checking-interfaces-for-llvm-libc/87685 Add internal Full diff: https://github.com/llvm/llvm-project/pull/163316.diff 2 Files Affected:
diff --git a/libc/src/__support/annex_k/CMakeLists.txt b/libc/src/__support/annex_k/CMakeLists.txt
index 8eb65f2469b4f..4ef4e32ebdd85 100644
--- a/libc/src/__support/annex_k/CMakeLists.txt
+++ b/libc/src/__support/annex_k/CMakeLists.txt
@@ -11,6 +11,15 @@ add_header_library(
libc.src.stdlib.abort
)
+add_header_library(
+ constraint_macros
+ HDRS
+ constraint_macros.h
+ DEPENDS
+ .libc_constraint_handler
+ libc.src.__support.libc_errno
+)
+
add_header_library(
libc_constraint_handler
HDRS
diff --git a/libc/src/__support/annex_k/constraint_macros.h b/libc/src/__support/annex_k/constraint_macros.h
new file mode 100644
index 0000000000000..835c161dd0d30
--- /dev/null
+++ b/libc/src/__support/annex_k/constraint_macros.h
@@ -0,0 +1,44 @@
+//===-- Helper macros header for constraint violations ----------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_SRC___SUPPORT_ANNEX_K_MACROS_H
+#define LLVM_LIBC_SRC___SUPPORT_ANNEX_K_MACROS_H
+
+#include "libc_constraint_handler.h"
+#include "src/__support/libc_errno.h"
+
+#define _CONSTRAINT_VIOLATION(msg, error_code, ret_code) \
+ { \
+ libc_errno = error_code; \
+ libc_constraint_handler(msg, nullptr, error_code); \
+ return ret_code; \
+ }
+
+#define _CONSTRAINT_VIOLATION_IF(expr, error_code, return_code) \
+ { \
+ auto expr_val = expr; \
+ if (expr_val) { \
+ libc_errno = error_code; \
+ libc_constraint_handler(nullptr, nullptr, error_code); \
+ return return_code; \
+ } \
+ }
+
+#define _CONSTRAINT_VIOLATION_CLEANUP_IF(expr, cleanup, error_code, \
+ return_code) \
+ { \
+ auto expr_val = expr; \
+ if (expr_val) { \
+ cleanup; \
+ libc_errno = error_code; \
+ libc_constraint_handler(nullptr, nullptr, error_code); \
+ return return_code; \
+ } \
+ }
+
+#endif // LLVM_LIBC_SRC___SUPPORT_ANNEX_K_MACROS_H
|
8c1ce5e
to
8694e32
Compare
8694e32
to
edaf560
Compare
a78a769
to
13d94e2
Compare
edaf560
to
c6bdbcd
Compare
13d94e2
to
6c5ed3e
Compare
d66c46e
to
cbc97af
Compare
6c5ed3e
to
c7bce13
Compare
cbc97af
to
71bcc2a
Compare
c7bce13
to
387bde0
Compare
71bcc2a
to
ef18847
Compare
387bde0
to
63619c4
Compare
fa1dee7
to
3168fd8
Compare
993b396
to
20f3456
Compare
3168fd8
to
fb877c9
Compare
20f3456
to
525adcc
Compare
RFC https://discourse.llvm.org/t/rfc-bounds-checking-interfaces-for-llvm-libc/87685
Add internal
libc_constraint_handler
macros required by Annex K interface in LLVM libc.