3.12.08 release

electronicarts · Jan 4, 2019 · 7c31d37 · 7c31d37
1 parent e75a74e
commit 7c31d37
Show file tree

Hide file tree

Showing 12 changed files with 220 additions and 235 deletions.
diff --git a/benchmark/source/BenchmarkHash.cpp b/benchmark/source/BenchmarkHash.cpp
diff --git a/benchmark/source/BenchmarkSort.cpp b/benchmark/source/BenchmarkSort.cpp
@@ -10,17 +10,12 @@
 #include "EASTLBenchmark.h"
 #include "EASTLTest.h"
 
-#ifdef _MSC_VER
-	#pragma warning(push, 0)
-	#pragma warning(disable: 4350)
-#endif
+EA_DISABLE_ALL_VC_WARNINGS()
 #include <stdlib.h>
 #include <algorithm>
 #include <functional>
 #include <vector>
-#ifdef _MSC_VER
-	#pragma warning(pop)
-#endif
+EA_RESTORE_ALL_VC_WARNINGS()
 
 
 using namespace EA;
@@ -1168,6 +1163,8 @@ static int CompareSmallInputSortPerformanceHelper(eastl::vector<eastl_size_t> &a
 							stopwatch.Stop();
 							break;
 
+						case sf_qsort:
+						case sf_radix_sort:
 						case sf_count:
 						default:
 							EATEST_VERIFY_F(false, "Missing case statement for sort function %s.", GetSortFunctionName(sortFunction));

diff --git a/include/EASTL/internal/config.h b/include/EASTL/internal/config.h
@@ -89,8 +89,8 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef EASTL_VERSION
-	#define EASTL_VERSION   "3.12.07"
-	#define EASTL_VERSION_N  31207
+	#define EASTL_VERSION   "3.12.08"
+	#define EASTL_VERSION_N  31208
 #endif
 
 

diff --git a/include/EASTL/internal/function_detail.h b/include/EASTL/internal/function_detail.h
@@ -407,13 +407,15 @@ namespace eastl
 			template <typename Functor, typename = EASTL_INTERNAL_FUNCTION_DETAIL_VALID_FUNCTION_ARGS(Functor, R, Args..., function_detail)>
 			function_detail& operator=(Functor&& functor)
 			{
+				Destroy();
 				CreateForwardFunctor(eastl::forward<Functor>(functor));
 				return *this;
 			}
 
 			template <typename Functor>
 			function_detail& operator=(eastl::reference_wrapper<Functor> f) EA_NOEXCEPT
 			{
+				Destroy();
 				CreateForwardFunctor(f);
 				return *this;
 			}

diff --git a/include/EASTL/list.h b/include/EASTL/list.h
@@ -384,10 +384,10 @@ namespace eastl
 		iterator insert(const_iterator position, const value_type& value);
 		iterator insert(const_iterator position, value_type&& x);
 		iterator insert(const_iterator position, std::initializer_list<value_type> ilist);
-		void     insert(const_iterator position, size_type n, const value_type& value); // TODO(rparolin): return iterator C++11 support
+		iterator insert(const_iterator position, size_type n, const value_type& value);
 
 		template <typename InputIterator>
-		void insert(const_iterator position, InputIterator first, InputIterator last);  // TODO(rparolin): return iterator C++11 support
+		iterator insert(const_iterator position, InputIterator first, InputIterator last);
 
 		iterator erase(const_iterator position);
 		iterator erase(const_iterator first, const_iterator last);
@@ -1374,18 +1374,25 @@ namespace eastl
 	}
 
 	template <typename T, typename Allocator>
-	inline void list<T, Allocator>::insert(const_iterator position, size_type n, const value_type& value)
+	inline typename list<T, Allocator>::iterator
+	list<T, Allocator>::insert(const_iterator position, size_type n, const value_type& value)
 	{
-		// To do: Get rid of DoInsertValues and put its implementation directly here.
+		iterator itPrev(position.mpNode);
+		--itPrev;
 		DoInsertValues((ListNodeBase*)position.mpNode, n, value);
+		return ++itPrev; // Inserts in front of position, returns iterator to new elements. 
 	}
 
 
 	template <typename T, typename Allocator>
 	template <typename InputIterator>
-	inline void list<T, Allocator>::insert(const_iterator position, InputIterator first, InputIterator last)
+	inline typename list<T, Allocator>::iterator
+	list<T, Allocator>::insert(const_iterator position, InputIterator first, InputIterator last)
 	{
+		iterator itPrev(position.mpNode);
+		--itPrev;
 		DoInsert((ListNodeBase*)position.mpNode, first, last, is_integral<InputIterator>());
+		return ++itPrev; // Inserts in front of position, returns iterator to new elements. 
 	}
 
 

diff --git a/include/EASTL/scoped_array.h b/include/EASTL/scoped_array.h
@@ -126,7 +126,7 @@ namespace eastl
 		/// Example usage:
 		///    scoped_array<int> ptr(new int[6]);
 		///    int x = ptr[2];
-		T& operator[](ptrdiff_t i) const
+		typename add_lvalue_reference<T>::type operator[](ptrdiff_t i) const
 		{
 			// assert(mpArray && (i >= 0));
 			return mpArray[i];

diff --git a/include/EASTL/scoped_ptr.h b/include/EASTL/scoped_ptr.h
@@ -145,7 +145,7 @@ namespace eastl
 		/// Example usage:
 		///    scoped_ptr<int> ptr(new int(3));
 		///    int x = *ptr;
-		T& operator*() const
+		typename add_lvalue_reference<T>::type operator*() const
 		{
 			// assert(mpValue);
 			return *mpValue;

diff --git a/test/packages/EABase/include/Common/EABase/config/eaplatform.h b/test/packages/EABase/include/Common/EABase/config/eaplatform.h
@@ -340,7 +340,7 @@
 			#define EA_PLATFORM_DESCRIPTION "OSX on ARM64"
 		#elif defined(__POWERPC64__) || defined(__powerpc64__)
 			#define EA_PROCESSOR_POWERPC 1
-			#define CS_UNDEFINED_STRING 1
+			#define EA_PROCESSOR_POWERPC_64 1
 			#define EA_SYSTEM_BIG_ENDIAN 1
 			#define EA_PLATFORM_DESCRIPTION "OSX on PowerPC 64"
 		#elif defined(__POWERPC__) || defined(__powerpc__)
@@ -393,7 +393,7 @@
 		#define EA_PLATFORM_DESCRIPTION "Linux on x64"
 	#elif defined(__powerpc64__)
 		#define EA_PROCESSOR_POWERPC 1
-		#define CS_UNDEFINED_STRING 1
+		#define EA_PROCESSOR_POWERPC_64 1
 		#define EA_SYSTEM_BIG_ENDIAN 1
 		#define EA_PLATFORM_DESCRIPTION "Linux on PowerPC 64"
 	#elif defined(__powerpc__)
@@ -427,7 +427,7 @@
 		#define EA_PLATFORM_DESCRIPTION "BSD on x64"
 	#elif defined(__powerpc64__)
 		#define EA_PROCESSOR_POWERPC 1
-		#define CS_UNDEFINED_STRING 1
+		#define EA_PROCESSOR_POWERPC_64 1
 		#define EA_SYSTEM_BIG_ENDIAN 1
 		#define EA_PLATFORM_DESCRIPTION "BSD on PowerPC 64"
 	#elif defined(__powerpc__)

diff --git a/test/source/TestFunctional.cpp b/test/source/TestFunctional.cpp
@@ -15,7 +15,7 @@
 
 EA_DISABLE_ALL_VC_WARNINGS()
 #include <functional>
-EA_RESTORE_ALL_VC_WARNINGS();
+EA_RESTORE_ALL_VC_WARNINGS()
 
 namespace
 {
@@ -795,7 +795,6 @@ int TestFunctional()
 				EATEST_VERIFY(fn0() == 1 && fn1() == 1);
 			}
 
-			#if !EASTL_NO_RVALUE_REFERENCES
 			{
 				eastl::function<int()> fn0 = ReturnZero;
 				eastl::function<int()> fn1 = ReturnOne;
@@ -804,7 +803,6 @@ int TestFunctional()
 				fn0 = eastl::move(fn1);
 				EATEST_VERIFY(fn0() == 1 && fn1 == nullptr);
 			}
-			#endif
 
 			{
 				eastl::function<int(int)> f1(nullptr);
@@ -895,6 +893,33 @@ int TestFunctional()
 			EATEST_VERIFY(fn() == 7);
 			EATEST_VERIFY(fn() == 8);
 		}
+
+		// user regression for memory leak when re-assigning an eastl::function which already holds a large closure.
+		{
+				static int sCtorCount = 0;
+				static int sDtorCount = 0;
+
+				{
+					struct local
+					{
+						local() { sCtorCount++; }
+						local(const local&) {  sCtorCount++; }
+						local(local&&)  {  sCtorCount++; }
+						~local() { sDtorCount++; }
+
+						void operator=(const local&) = delete; // suppress msvc warning
+					} l;
+
+					eastl::function<bool()> f;
+
+					f = [l]() { return false; };
+
+					// ensure closure resources are cleaned up when assigning to a non-null eastl::function.
+					f = [l]() { return true; };
+				}
+
+				EATEST_VERIFY(sCtorCount == sDtorCount);
+		}
 	}
 
 	// Checking _MSC_EXTENSIONS is required because the Microsoft calling convention classifiers are only available when

diff --git a/test/source/TestList.cpp b/test/source/TestList.cpp
@@ -618,8 +618,10 @@ int TestList()
 		auto insert_pos = a.begin();
 		eastl::advance(insert_pos, 5);
 
-		a.insert(insert_pos, 4, 42);
+		auto result = a.insert(insert_pos, 4, 42);
 		VERIFY(a == ref);
+		VERIFY(*result == 42);
+		VERIFY(*(--result) == 4);
 	}
 
 	// void insert(const_iterator position, InputIterator first, InputIterator last);
@@ -631,8 +633,10 @@ int TestList()
 		auto insert_pos = a.begin();
 		eastl::advance(insert_pos, 5);
 
-		a.insert(insert_pos, to_insert.begin(), to_insert.end());
+		auto result = a.insert(insert_pos, to_insert.begin(), to_insert.end());
 		VERIFY(a == ref);
+		VERIFY(*result == 42);
+		VERIFY(*(--result) == 4);
 	}
 
 	// iterator insert(const_iterator position, std::initializer_list<value_type> ilist);

diff --git a/test/source/TestOptional.cpp b/test/source/TestOptional.cpp
@@ -539,10 +539,12 @@ int TestOptional()
 		}
 		{
 			// user regression
+			EA_DISABLE_VC_WARNING(4625 4626) // copy/assignment operator constructor was implicitly defined as deleted
 			struct local
 			{
 				eastl::unique_ptr<int> ptr;
 			};
+			EA_RESTORE_VC_WARNING()
 
 			eastl::optional<local> o1 = local{eastl::make_unique<int>(42)};
 			eastl::optional<local> o2;

diff --git a/test/source/TestSmartPtr.cpp b/test/source/TestSmartPtr.cpp
@@ -823,6 +823,11 @@ static int Test_scoped_ptr()
 		delete pA;
 	}
 
+	{
+		scoped_ptr<void> ptr(new int);
+		(void)ptr;
+	}
+
 	EATEST_VERIFY(A::mCount == 0);
 
 	return nErrorCount;
@@ -880,6 +885,11 @@ static int Test_scoped_array()
 		delete[] pArray;
 	}
 
+	{
+		scoped_array<void> ptr(new int[6]);
+		(void)ptr;
+	}
+
 	EATEST_VERIFY(A::mCount == 0);
 
 	return nErrorCount;