aboutsummaryrefslogtreecommitdiffstats
path: root/include/llvm-c
diff options
context:
space:
mode:
authorChandler Carruth <chandlerc@gmail.com>2012-01-25 07:40:15 +0000
committerChandler Carruth <chandlerc@gmail.com>2012-01-25 07:40:15 +0000
commit8f7fe08fee403994a50bb3c07384453c0d046558 (patch)
tree7f7046a428202731fb5c193074211aaeb46bd0a2 /include/llvm-c
parenta15c9d84defba6fac942cd8b573dd44e1c0bb989 (diff)
downloadexternal_llvm-8f7fe08fee403994a50bb3c07384453c0d046558.zip
external_llvm-8f7fe08fee403994a50bb3c07384453c0d046558.tar.gz
external_llvm-8f7fe08fee403994a50bb3c07384453c0d046558.tar.bz2
Revert a tiny bit of r148553 which extended LLVM's function attributes
to 64-bits, and added a new attribute in bit #32. Specifically, remove this new attribute from the enum used in the C API. It's not yet clear what the best approach is for exposing these new attributes in the C API, and several different proposals are on the table. Until then, we can simply not expose this bit in the API at all. Also, I've reverted a somewhat unrelated change in the same revision which switched from "1 << 31" to "1U << 31" for the top enum. While "1 << 31" is technically undefined behavior, implementations DTRT here. However, MS and -pedantic mode warn about non-'int' type enumerator values. If folks feel strongly about this I can put the 'U' back in, but it seemed best to wait for the proper solution. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@148937 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/llvm-c')
-rw-r--r--include/llvm-c/Core.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/include/llvm-c/Core.h b/include/llvm-c/Core.h
index d5883dc..ba48d1f 100644
--- a/include/llvm-c/Core.h
+++ b/include/llvm-c/Core.h
@@ -118,8 +118,12 @@ typedef enum {
LLVMStackAlignment = 7<<26,
LLVMReturnsTwice = 1 << 29,
LLVMUWTable = 1 << 30,
- LLVMNonLazyBind = 1U << 31,
- LLVMAddressSafety = 1ULL << 32
+ LLVMNonLazyBind = 1 << 31
+
+ // FIXME: This attribute is currently not included in the C API as
+ // a temporary measure until the API/ABI impact to the C API is understood
+ // and the path forward agreed upon.
+ //LLVMAddressSafety = 1ULL << 32
} LLVMAttribute;
typedef enum {