[compiler-rt] r297392 - Reapply r297382: "[compiler-rt][builtins] Add __isOSVersionAtLeast()"
Erik Pilkington via llvm-commits
llvm-commits at lists.llvm.org
Thu Mar 9 09:02:16 PST 2017
Author: epilk
Date: Thu Mar 9 11:02:16 2017
New Revision: 297392
URL: http://llvm.org/viewvc/llvm-project?rev=297392&view=rev
Log:
Reapply r297382: "[compiler-rt][builtins] Add __isOSVersionAtLeast()"
Looks like the problem was a case-insensitive include of dispatch/dispatch.h.
Added:
compiler-rt/trunk/lib/builtins/os_version_check.c
compiler-rt/trunk/test/builtins/CMakeLists.txt
compiler-rt/trunk/test/builtins/TestCases/Darwin/lit.local.cfg
compiler-rt/trunk/test/builtins/TestCases/Darwin/os_version_check_test.c
compiler-rt/trunk/test/builtins/lit.cfg
compiler-rt/trunk/test/builtins/lit.site.cfg.in
Modified:
compiler-rt/trunk/lib/builtins/CMakeLists.txt
compiler-rt/trunk/test/CMakeLists.txt
compiler-rt/trunk/test/lit.common.cfg
Modified: compiler-rt/trunk/lib/builtins/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/builtins/CMakeLists.txt?rev=297392&r1=297391&r2=297392&view=diff
==============================================================================
--- compiler-rt/trunk/lib/builtins/CMakeLists.txt (original)
+++ compiler-rt/trunk/lib/builtins/CMakeLists.txt Thu Mar 9 11:02:16 2017
@@ -132,6 +132,7 @@ set(GENERIC_SOURCES
negvdi2.c
negvsi2.c
negvti2.c
+ os_version_check.c
paritydi2.c
paritysi2.c
parityti2.c
Added: compiler-rt/trunk/lib/builtins/os_version_check.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/builtins/os_version_check.c?rev=297392&view=auto
==============================================================================
--- compiler-rt/trunk/lib/builtins/os_version_check.c (added)
+++ compiler-rt/trunk/lib/builtins/os_version_check.c Thu Mar 9 11:02:16 2017
@@ -0,0 +1,115 @@
+/* ===-- os_version_check.c - OS version checking -------------------------===
+ *
+ * The LLVM Compiler Infrastructure
+ *
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
+ *
+ * ===----------------------------------------------------------------------===
+ *
+ * This file implements the function __isOSVersionAtLeast, used by
+ * Objective-C's @available
+ *
+ * ===----------------------------------------------------------------------===
+ */
+
+#ifdef __APPLE__
+
+#include <CoreFoundation/CoreFoundation.h>
+#include <dispatch/dispatch.h>
+#include <TargetConditionals.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+/* These three variables hold the host's OS version. */
+static int32_t GlobalMajor, GlobalMinor, GlobalSubminor;
+static dispatch_once_t DispatchOnceCounter;
+
+/* Find and parse the SystemVersion.plist file. */
+static void parseSystemVersionPList(void *Unused) {
+ (void)Unused;
+
+ char *PListPath = "/System/Library/CoreServices/SystemVersion.plist";
+
+#if TARGET_OS_SIMULATOR
+ char *PListPathPrefix = getenv("IPHONE_SIMULATOR_ROOT");
+ if (!PListPathPrefix)
+ return;
+ char FullPath[strlen(PListPathPrefix) + strlen(PListPath) + 1];
+ strcpy(FullPath, PListPathPrefix);
+ strcat(FullPath, PListPath);
+ PListPath = FullPath;
+#endif
+ FILE *PropertyList = fopen(PListPath, "r");
+ if (!PropertyList)
+ return;
+
+ /* Dynamically allocated stuff. */
+ CFDictionaryRef PListRef = NULL;
+ CFDataRef FileContentsRef = NULL;
+ UInt8 *PListBuf = NULL;
+
+ fseek(PropertyList, 0, SEEK_END);
+ long PListFileSize = ftell(PropertyList);
+ if (PListFileSize < 0)
+ goto Fail;
+ rewind(PropertyList);
+
+ PListBuf = malloc((size_t)PListFileSize);
+ if (!PListBuf)
+ goto Fail;
+
+ size_t NumRead = fread(PListBuf, 1, (size_t)PListFileSize, PropertyList);
+ if (NumRead != (size_t)PListFileSize)
+ goto Fail;
+
+ /* Get the file buffer into CF's format. We pass in a null allocator here *
+ * because we free PListBuf ourselves */
+ FileContentsRef = CFDataCreateWithBytesNoCopy(
+ NULL, PListBuf, (CFIndex)NumRead, kCFAllocatorNull);
+ if (!FileContentsRef)
+ goto Fail;
+
+ if (&CFPropertyListCreateWithData)
+ PListRef = CFPropertyListCreateWithData(
+ NULL, FileContentsRef, kCFPropertyListImmutable, NULL, NULL);
+ else
+ PListRef = CFPropertyListCreateFromXMLData(NULL, FileContentsRef,
+ kCFPropertyListImmutable, NULL);
+ if (!PListRef)
+ goto Fail;
+
+ CFTypeRef OpaqueValue =
+ CFDictionaryGetValue(PListRef, CFSTR("ProductVersion"));
+ if (!OpaqueValue || CFGetTypeID(OpaqueValue) != CFStringGetTypeID())
+ goto Fail;
+
+ char VersionStr[32];
+ if (!CFStringGetCString((CFStringRef)OpaqueValue, VersionStr,
+ sizeof(VersionStr), kCFStringEncodingUTF8))
+ goto Fail;
+ sscanf(VersionStr, "%d.%d.%d", &GlobalMajor, &GlobalMinor, &GlobalSubminor);
+
+Fail:
+ if (PListRef)
+ CFRelease(PListRef);
+ if (FileContentsRef)
+ CFRelease(FileContentsRef);
+ free(PListBuf);
+ fclose(PropertyList);
+}
+
+int32_t __isOSVersionAtLeast(int32_t Major, int32_t Minor, int32_t Subminor) {
+ /* Populate the global version variables, if they haven't already. */
+ dispatch_once_f(&DispatchOnceCounter, NULL, parseSystemVersionPList);
+
+ if (Major < GlobalMajor) return 1;
+ if (Major > GlobalMajor) return 0;
+ if (Minor < GlobalMinor) return 1;
+ if (Minor > GlobalMinor) return 0;
+ return Subminor <= GlobalSubminor;
+}
+
+#endif
Modified: compiler-rt/trunk/test/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/CMakeLists.txt?rev=297392&r1=297391&r2=297392&view=diff
==============================================================================
--- compiler-rt/trunk/test/CMakeLists.txt (original)
+++ compiler-rt/trunk/test/CMakeLists.txt Thu Mar 9 11:02:16 2017
@@ -5,9 +5,8 @@ configure_lit_site_cfg(
${CMAKE_CURRENT_SOURCE_DIR}/lit.common.configured.in
${CMAKE_CURRENT_BINARY_DIR}/lit.common.configured)
-# BlocksRuntime and builtins testsuites are not yet ported to lit.
+# BlocksRuntime (and most of builtins) testsuites are not yet ported to lit.
# add_subdirectory(BlocksRuntime)
-# add_subdirectory(builtins)
set(SANITIZER_COMMON_LIT_TEST_DEPS)
if(COMPILER_RT_STANDALONE_BUILD)
@@ -39,6 +38,9 @@ endif()
# Run sanitizer tests only if we're sure that clang would produce
# working binaries.
if(COMPILER_RT_CAN_EXECUTE_TESTS)
+ if(COMPILER_RT_BUILD_BUILTINS)
+ add_subdirectory(builtins)
+ endif()
if(COMPILER_RT_HAS_ASAN)
add_subdirectory(asan)
endif()
Added: compiler-rt/trunk/test/builtins/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/builtins/CMakeLists.txt?rev=297392&view=auto
==============================================================================
--- compiler-rt/trunk/test/builtins/CMakeLists.txt (added)
+++ compiler-rt/trunk/test/builtins/CMakeLists.txt Thu Mar 9 11:02:16 2017
@@ -0,0 +1,15 @@
+set(BUILTINS_LIT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+
+set(BUILTINS_TEST_DEPS ${SANITIZER_COMMON_LIT_TEST_DEPS} builtins)
+set(BUILTINS_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/TestCases)
+
+# Test cases.
+configure_lit_site_cfg(
+ ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
+ ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
+)
+
+add_lit_testsuite(check-builtins "Running the Builtins tests"
+ ${BUILTINS_TESTSUITES}
+ DEPENDS ${BUILTINS_TEST_DEPS})
+set_target_properties(check-builtins PROPERTIES FOLDER "Compiler-RT Misc")
Added: compiler-rt/trunk/test/builtins/TestCases/Darwin/lit.local.cfg
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/builtins/TestCases/Darwin/lit.local.cfg?rev=297392&view=auto
==============================================================================
--- compiler-rt/trunk/test/builtins/TestCases/Darwin/lit.local.cfg (added)
+++ compiler-rt/trunk/test/builtins/TestCases/Darwin/lit.local.cfg Thu Mar 9 11:02:16 2017
@@ -0,0 +1,9 @@
+def getRoot(config):
+ if not config.parent:
+ return config
+ return getRoot(config.parent)
+
+root = getRoot(config)
+
+if root.host_os not in ['Darwin']:
+ config.unsupported = True
Added: compiler-rt/trunk/test/builtins/TestCases/Darwin/os_version_check_test.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/builtins/TestCases/Darwin/os_version_check_test.c?rev=297392&view=auto
==============================================================================
--- compiler-rt/trunk/test/builtins/TestCases/Darwin/os_version_check_test.c (added)
+++ compiler-rt/trunk/test/builtins/TestCases/Darwin/os_version_check_test.c Thu Mar 9 11:02:16 2017
@@ -0,0 +1,19 @@
+// RUN: %clang %s -o %t -mmacosx-version-min=10.5 -framework CoreFoundation -DMAJOR=%macos_version_major -DMINOR=%macos_version_minor -DSUBMINOR=%macos_version_subminor
+// RUN: %run %t
+
+int __isOSVersionAtLeast(int Major, int Minor, int Subminor);
+
+int main() {
+ if (!__isOSVersionAtLeast(MAJOR, MINOR, SUBMINOR))
+ return 1;
+ if (__isOSVersionAtLeast(MAJOR, MINOR, SUBMINOR + 1))
+ return 1;
+ if (SUBMINOR && __isOSVersionAtLeast(MAJOR + 1, MINOR, SUBMINOR - 1))
+ return 1;
+ if (SUBMINOR && !__isOSVersionAtLeast(MAJOR, MINOR, SUBMINOR - 1))
+ return 1;
+ if (MAJOR && !__isOSVersionAtLeast(MAJOR - 1, MINOR + 1, SUBMINOR))
+ return 1;
+
+ return 0;
+}
Added: compiler-rt/trunk/test/builtins/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/builtins/lit.cfg?rev=297392&view=auto
==============================================================================
--- compiler-rt/trunk/test/builtins/lit.cfg (added)
+++ compiler-rt/trunk/test/builtins/lit.cfg Thu Mar 9 11:02:16 2017
@@ -0,0 +1,20 @@
+# -*- Python -*-
+
+import os
+
+# Setup config name.
+config.name = 'Builtins'
+
+# Setup source root.
+config.test_source_root = os.path.dirname(__file__)
+
+# Test suffixes.
+config.suffixes = ['.c', '.cc', '.cpp', '.m', '.mm']
+
+# Define %clang and %clangxx substitutions to use in test RUN lines.
+config.substitutions.append( ("%clang ", " " + config.clang + " ") )
+
+if config.host_os == 'Darwin':
+ config.substitutions.append( ("%macos_version_major", str(config.darwin_osx_version[0])) )
+ config.substitutions.append( ("%macos_version_minor", str(config.darwin_osx_version[1])) )
+ config.substitutions.append( ("%macos_version_subminor", str(config.darwin_osx_version[2])) )
Added: compiler-rt/trunk/test/builtins/lit.site.cfg.in
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/builtins/lit.site.cfg.in?rev=297392&view=auto
==============================================================================
--- compiler-rt/trunk/test/builtins/lit.site.cfg.in (added)
+++ compiler-rt/trunk/test/builtins/lit.site.cfg.in Thu Mar 9 11:02:16 2017
@@ -0,0 +1,7 @@
+ at LIT_SITE_CFG_IN_HEADER@
+
+# Load common config for all compiler-rt lit tests.
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")
+
+# Load tool-specific config that would do the real work.
+lit_config.load_config(config, "@BUILTINS_LIT_SOURCE_DIR@/lit.cfg")
Modified: compiler-rt/trunk/test/lit.common.cfg
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/lit.common.cfg?rev=297392&r1=297391&r2=297392&view=diff
==============================================================================
--- compiler-rt/trunk/test/lit.common.cfg (original)
+++ compiler-rt/trunk/test/lit.common.cfg Thu Mar 9 11:02:16 2017
@@ -129,6 +129,7 @@ if config.host_os == 'Darwin':
try:
osx_version = subprocess.check_output(["sw_vers", "-productVersion"])
osx_version = tuple(int(x) for x in osx_version.split('.'))
+ config.darwin_osx_version = osx_version
if osx_version >= (10, 11):
config.available_features.add('osx-autointerception')
config.available_features.add('osx-ld64-live_support')
More information about the llvm-commits
mailing list