Disable tests for unique addressing for msvc and partially for gcc 4.6

boostorg · Jun 23, 2016 · bc8b5bc · bc8b5bc
1 parent 6e767a0
commit bc8b5bc
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 72 deletions.
diff --git a/include/fit/config.hpp b/include/fit/config.hpp
@@ -97,19 +97,6 @@
 #endif
 #endif
 
-// Whether static variables will be a unique address across translation units.
-// This can affect PCH on MSVC, so its currently disabled.
-#ifndef FIT_NO_UNIQUE_STATIC_VAR
-#define FIT_NO_UNIQUE_STATIC_VAR 0
-#endif
-
-// Whether static variables from lambdas will be a unique address across
-// translation units. This is only supported on compilers that can do a
-// constexpr reintrepret_cast.
-#ifndef FIT_NO_UNIQUE_STATIC_LAMBDA_FUNCTION_ADDR
-#define FIT_NO_UNIQUE_STATIC_LAMBDA_FUNCTION_ADDR 0
-#endif
-
 // Whether to use template aliases
 #ifndef FIT_HAS_TEMPLATE_ALIAS
 #if defined(__GNUC__) && !defined (__clang__) && __GNUC__ == 4 && __GNUC_MINOR__ < 8
@@ -148,7 +135,7 @@
 #endif
 #endif
 
-// SOme type expansion failures on gcc 4.6
+// Some type expansion failures on gcc 4.6
 #ifndef FIT_NO_TYPE_PACK_EXPANSION_IN_TEMPLATE
 #if defined(__GNUC__) && !defined (__clang__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7
 #define FIT_NO_TYPE_PACK_EXPANSION_IN_TEMPLATE 1

diff --git a/include/fit/detail/inline_var.hpp b/include/fit/detail/inline_var.hpp
diff --git a/include/fit/detail/static_const_var.hpp b/include/fit/detail/static_const_var.hpp
@@ -8,7 +8,7 @@
 #ifndef FIT_GUARD_STATIC_CONST_H
 #define FIT_GUARD_STATIC_CONST_H
 
-#include <fit/detail/inline_var.hpp>
+#include <fit/detail/intrinsics.hpp>
 
 namespace fit { namespace detail {
 
@@ -29,7 +29,7 @@ struct static_const_var_factory
     template<class T>
     constexpr const T& operator=(const T&) const
     {
-        // static_assert(FIT_IS_DEFAULT_CONSTRUCTIBLE(T), "Static const variable must be default constructible");
+        static_assert(FIT_IS_DEFAULT_CONSTRUCTIBLE(T), "Static const variable must be default constructible");
         return static_const_storage<T>::value;
     }
 };
@@ -44,6 +44,12 @@ constexpr const T& static_const_var()
 
 } // namespace fit
 
+#if FIT_HAS_RELAXED_CONSTEXPR || defined(_MSC_VER)
+#define FIT_STATIC_CONSTEXPR const constexpr
+#else
+#define FIT_STATIC_CONSTEXPR static constexpr
+#endif
+
 #if defined(__GNUC__) && !defined (__clang__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7
 #define FIT_STATIC_AUTO_REF extern __attribute__((weak)) constexpr auto
 #else

diff --git a/include/fit/detail/static_constexpr.hpp b/include/fit/detail/static_constexpr.hpp
diff --git a/test/static_def/static_def.cpp b/test/static_def/static_def.cpp
@@ -40,12 +40,12 @@ int main()
     if (fit_test::fit_sum_lambda(1, 2) != 3) printf("FAILED\n");
     if (fit_test::fit_sum(1, 2) != 3) printf("FAILED\n");
 
-#if !FIT_NO_UNIQUE_STATIC_LAMBDA_FUNCTION_ADDR
+#if FIT_HAS_UNIQUE_STATIC_LAMBDA_FUNCTION_ADDR
     if (sum_lambda_addr() != f_sum_lambda_addr()) printf("FAILED: Lambda\n");
     if (sum_fo_addr() != f_sum_fo_addr()) printf("FAILED: Function object\n");
 #endif
 
-#if !FIT_NO_UNIQUE_STATIC_VAR
+#if FIT_HAS_UNIQUE_STATIC_VAR
     if (sum_var_addr() != f_sum_var_addr()) printf("FAILED: Lambda\n");
     if (sum_constexpr_fo_addr() != f_sum_constexpr_fo_addr()) printf("FAILED: Function object\n");
 #endif

diff --git a/test/static_def/static_def.hpp b/test/static_def/static_def.hpp
@@ -5,6 +5,19 @@
 #include <fit/function.hpp>
 #include <fit/lambda.hpp>
 
+// MSVC seems to not support unique addressing at all
+#if defined (_MSC_VER)
+#define FIT_HAS_UNIQUE_STATIC_VAR 0
+#define FIT_HAS_UNIQUE_STATIC_LAMBDA_FUNCTION_ADDR 0
+// Gcc 4.6 only supports unique addressing for non-lambdas
+#elif defined(__GNUC__) && !defined (__clang__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7
+#define FIT_HAS_UNIQUE_STATIC_VAR 1
+#define FIT_HAS_UNIQUE_STATIC_LAMBDA_FUNCTION_ADDR 0
+#else
+#define FIT_HAS_UNIQUE_STATIC_VAR 1
+#define FIT_HAS_UNIQUE_STATIC_LAMBDA_FUNCTION_ADDR 1
+#endif
+
 namespace fit_test {
 
 FIT_STATIC_LAMBDA_FUNCTION(fit_sum_lambda) = [](int x, int y) 

diff --git a/test/static_def/static_def2.cpp b/test/static_def/static_def2.cpp
@@ -38,12 +38,12 @@ int f()
     if (fit_test::fit_sum_lambda(1, 2) != 3) printf("FAILED\n");
     if (fit_test::fit_sum(1, 2) != 3) printf("FAILED\n");
 
-#if !FIT_NO_UNIQUE_STATIC_LAMBDA_FUNCTION_ADDR
+#if FIT_HAS_UNIQUE_STATIC_LAMBDA_FUNCTION_ADDR
     if (sum_lambda_addr() != f_sum_lambda_addr()) printf("FAILED: Lambda\n");
     if (sum_fo_addr() != f_sum_fo_addr()) printf("FAILED: Function object\n");
 #endif
 
-#if !FIT_NO_UNIQUE_STATIC_VAR
+#if FIT_HAS_UNIQUE_STATIC_VAR
     if (sum_var_addr() != f_sum_var_addr()) printf("FAILED: Lambda\n");
     if (sum_constexpr_fo_addr() != f_sum_constexpr_fo_addr()) printf("FAILED: Function object\n");
 #endif