Index: libcxx/test/std/thread/futures/futures.task/futures.task.members/assign_move.pass.cpp
===================================================================
--- libcxx/test/std/thread/futures/futures.task/futures.task.members/assign_move.pass.cpp
+++ libcxx/test/std/thread/futures/futures.task/futures.task.members/assign_move.pass.cpp
@@ -40,7 +40,7 @@
         assert(p.valid());
         std::future<double> f = p.get_future();
         p(3, 'a');
-        assert(f.get() == 105.0);
+        assert(f.get() == 8.0 + 'a');
     }
     {
         std::packaged_task<double(int, char)> p0;
Index: libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor_func.pass.cpp
===================================================================
--- libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor_func.pass.cpp
+++ libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor_func.pass.cpp
@@ -48,7 +48,7 @@
         assert(p.valid());
         std::future<double> f = p.get_future();
         p(3, 'a');
-        assert(f.get() == 105.0);
+        assert(f.get() == 8.0 + 'a');
         assert(A::n_copies == 0);
         assert(A::n_moves > 0);
     }
@@ -60,7 +60,7 @@
         assert(p.valid());
         std::future<double> f = p.get_future();
         p(3, 'a');
-        assert(f.get() == 105.0);
+        assert(f.get() == 8.0 + 'a');
         assert(A::n_copies > 0);
         assert(A::n_moves > 0);
     }
Index: libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor_move.pass.cpp
===================================================================
--- libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor_move.pass.cpp
+++ libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor_move.pass.cpp
@@ -39,7 +39,7 @@
         assert(p.valid());
         std::future<double> f = p.get_future();
         p(3, 'a');
-        assert(f.get() == 105.0);
+        assert(f.get() == 8.0 + 'a');
     }
     {
         std::packaged_task<double(int, char)> p0;
Index: libcxx/test/std/thread/futures/futures.task/futures.task.members/dtor.pass.cpp
===================================================================
--- libcxx/test/std/thread/futures/futures.task/futures.task.members/dtor.pass.cpp
+++ libcxx/test/std/thread/futures/futures.task/futures.task.members/dtor.pass.cpp
@@ -63,7 +63,7 @@
         std::packaged_task<double(int, char)> p(A(5));
         std::future<double> f = p.get_future();
         support::make_test_thread(func2, std::move(p)).detach();
-        assert(f.get() == 105.0);
+        assert(f.get() == 8.0 + 'a');
     }
 
   return 0;
Index: libcxx/test/std/thread/futures/futures.task/futures.task.members/get_future.pass.cpp
===================================================================
--- libcxx/test/std/thread/futures/futures.task/futures.task.members/get_future.pass.cpp
+++ libcxx/test/std/thread/futures/futures.task/futures.task.members/get_future.pass.cpp
@@ -36,7 +36,7 @@
         std::packaged_task<double(int, char)> p(A(5));
         std::future<double> f = p.get_future();
         p(3, 'a');
-        assert(f.get() == 105.0);
+        assert(f.get() == 8.0 + 'a');
     }
 #ifndef TEST_HAS_NO_EXCEPTIONS
     {
Index: libcxx/test/std/thread/futures/futures.task/futures.task.members/make_ready_at_thread_exit.pass.cpp
===================================================================
--- libcxx/test/std/thread/futures/futures.task/futures.task.members/make_ready_at_thread_exit.pass.cpp
+++ libcxx/test/std/thread/futures/futures.task/futures.task.members/make_ready_at_thread_exit.pass.cpp
@@ -87,7 +87,7 @@
         std::packaged_task<double(int, char)> p(A(5));
         std::future<double> f = p.get_future();
         support::make_test_thread(func0, std::move(p)).detach();
-        assert(f.get() == 105.0);
+        assert(f.get() == 8.0 + 'a');
     }
 #ifndef TEST_HAS_NO_EXCEPTIONS
     {
@@ -101,14 +101,14 @@
         }
         catch (const A& e)
         {
-            assert(e(3, 'a') == 106);
+            assert(e(3, 'a') == 9.0 + 'a');
         }
     }
     {
         std::packaged_task<double(int, char)> p(A(5));
         std::future<double> f = p.get_future();
         support::make_test_thread(func2, std::move(p)).detach();
-        assert(f.get() == 105.0);
+        assert(f.get() == 8.0 + 'a');
     }
     {
         std::packaged_task<double(int, char)> p;
Index: libcxx/test/std/thread/futures/futures.task/futures.task.members/operator.pass.cpp
===================================================================
--- libcxx/test/std/thread/futures/futures.task/futures.task.members/operator.pass.cpp
+++ libcxx/test/std/thread/futures/futures.task/futures.task.members/operator.pass.cpp
@@ -87,7 +87,7 @@
         std::packaged_task<double(int, char)> p(A(5));
         std::future<double> f = p.get_future();
         support::make_test_thread(func0, std::move(p)).detach();
-        assert(f.get() == 105.0);
+        assert(f.get() == 8.0 + 'a');
     }
 #ifndef TEST_HAS_NO_EXCEPTIONS
     {
@@ -101,14 +101,14 @@
         }
         catch (const A& e)
         {
-            assert(e(3, 'a') == 106);
+            assert(e(3, 'a') == 9.0 + 'a');
         }
     }
     {
         std::packaged_task<double(int, char)> p(A(5));
         std::future<double> f = p.get_future();
         std::thread t = support::make_test_thread(func2, std::move(p));
-        assert(f.get() == 105.0);
+        assert(f.get() == 8.0 + 'a');
         t.join();
     }
     {
Index: libcxx/test/std/thread/futures/futures.task/futures.task.members/reset.pass.cpp
===================================================================
--- libcxx/test/std/thread/futures/futures.task/futures.task.members/reset.pass.cpp
+++ libcxx/test/std/thread/futures/futures.task/futures.task.members/reset.pass.cpp
@@ -39,11 +39,11 @@
         std::packaged_task<double(int, char)> p(A(5));
         std::future<double> f = p.get_future();
         p(3, 'a');
-        assert(f.get() == 105.0);
+        assert(f.get() == 8.0 + 'a');
         p.reset();
         p(4, 'a');
         f = p.get_future();
-        assert(f.get() == 106.0);
+        assert(f.get() == 9.0 + 'a');
     }
 #ifndef TEST_HAS_NO_EXCEPTIONS
     {
Index: libcxx/test/std/thread/futures/futures.task/futures.task.members/swap.pass.cpp
===================================================================
--- libcxx/test/std/thread/futures/futures.task/futures.task.members/swap.pass.cpp
+++ libcxx/test/std/thread/futures/futures.task/futures.task.members/swap.pass.cpp
@@ -40,7 +40,7 @@
         assert(p.valid());
         std::future<double> f = p.get_future();
         p(3, 'a');
-        assert(f.get() == 105.0);
+        assert(f.get() == 8.0 + 'a');
     }
     {
         std::packaged_task<double(int, char)> p0;
Index: libcxx/test/std/thread/futures/futures.task/futures.task.nonmembers/swap.pass.cpp
===================================================================
--- libcxx/test/std/thread/futures/futures.task/futures.task.nonmembers/swap.pass.cpp
+++ libcxx/test/std/thread/futures/futures.task/futures.task.nonmembers/swap.pass.cpp
@@ -42,7 +42,7 @@
         assert(p.valid());
         std::future<double> f = p.get_future();
         p(3, 'a');
-        assert(f.get() == 105.0);
+        assert(f.get() == 8.0 + 'a');
     }
     {
         std::packaged_task<double(int, char)> p0;