Export of internal Abseil changes.
-- ba4dd47492748bd630462eb68b7959037fc6a11a by Abseil Team <absl-team@google.com>: Work around nvcc 9.0 compiler bug for open-source Tensorflow build. With the current implementation, when I (unintentionally and transitively) include absl/types/optional.h in a CUDA compilation unit, I get the following nvcc error message: INFO: From Compiling tensorflow/core/kernels/crop_and_resize_op_gpu.cu.cc: external/com_google_absl/absl/types/optional.h: In member function 'void absl::optional_internal::optional_data_dtor_base<T, <anonymous> >::destruct()': external/com_google_absl/absl/types/optional.h:185:50: error: '__T0' was not declared in this scope data_.~T(); I've also seen similar compilation failures online, for flat_hash_map: https://devtalk.nvidia.com/default/topic/1042599/nvcc-preprocessor-bug-causes-compilation-failure/ The bug is always around unnamed template parameters. Therefore, the workaround is to make them named. PiperOrigin-RevId: 219208288 -- dad2f40cb2e8d5017660985ef6fb57f3c3cdcc80 by CJ Johnson <johnsoncj@google.com>: Adds internal macros for catching and throwing unknown exception types PiperOrigin-RevId: 219207362 -- 0a9840328d2d86e8420b853435fdbf1f7a19d931 by Abseil Team <absl-team@google.com>: Fix typo in mutex.h comments. PiperOrigin-RevId: 219199397 -- 0d576dc7597564210bfdf91518075064756f0bf4 by Matt Calabrese <calabrese@google.com>: Internal change. PiperOrigin-RevId: 219185475 -- 66be156095571959fb19a76da8ad0b53ec37658e by Abseil Team <absl-team@google.com>: Fix alignment conformance for VS 2017 >= 15.8 (fix #193) PiperOrigin-RevId: 219129894 -- a6e1825a12587945f8194677ccfdcaba6f7aad1d by Abseil Team <absl-team@google.com>: Reapply PR #173 PiperOrigin-RevId: 219129361 -- cf72ade4881b25acc6ccaea468f69793a0fdce32 by Abseil Team <absl-team@google.com>: Update .gitignore PiperOrigin-RevId: 219127495 -- 0537490c6348a2cb489abe15638928ac5aa6982a by Jon Cohen <cohenjon@google.com>: Small refactor and reformat of error messages from the exception safety test framework. PiperOrigin-RevId: 218927773 -- 4c556ca45fa25698ad12002a00c713aeceefab73 by CJ Johnson <johnsoncj@google.com>: Updates the inlined vector swap tests to check for number of moves that took place if available PiperOrigin-RevId: 218900777 -- dcbfda0021a1e6dfa9586986b1269c06ec394053 by Mark Barolak <mbar@google.com>: Add parens around calls to std::numeric_limits<>::min and std::numeric_limits<>::max to prevent compilation errors on Windows platforms where min and max are defined as macros. PiperOrigin-RevId: 218888700 GitOrigin-RevId: ba4dd47492748bd630462eb68b7959037fc6a11a Change-Id: I0e393958eb8cb501b85f6114979f6d4d86ed996c
This commit is contained in:
parent
0117457865
commit
a4c3ffff11
20 changed files with 147 additions and 110 deletions
|
@ -127,10 +127,8 @@ class ConstructorTracker {
|
|||
void* address = it.first;
|
||||
TrackedAddress& tracked_address = it.second;
|
||||
if (tracked_address.is_alive) {
|
||||
ADD_FAILURE() << "Object at address " << address
|
||||
<< " with countdown of " << countdown_
|
||||
<< " was not destroyed [" << tracked_address.description
|
||||
<< "]";
|
||||
ADD_FAILURE() << ErrorMessage(address, tracked_address.description,
|
||||
countdown_, "Object was not destroyed.");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -141,11 +139,11 @@ class ConstructorTracker {
|
|||
TrackedAddress& tracked_address =
|
||||
current_tracker_instance_->address_map_[address];
|
||||
if (tracked_address.is_alive) {
|
||||
ADD_FAILURE() << "Object at address " << address << " with countdown of "
|
||||
<< current_tracker_instance_->countdown_
|
||||
<< " was re-constructed. Previously: ["
|
||||
<< tracked_address.description << "] Now: [" << description
|
||||
<< "]";
|
||||
ADD_FAILURE() << ErrorMessage(
|
||||
address, tracked_address.description,
|
||||
current_tracker_instance_->countdown_,
|
||||
"Object was re-constructed. Current object was constructed by " +
|
||||
description);
|
||||
}
|
||||
tracked_address = {true, std::move(description)};
|
||||
}
|
||||
|
@ -159,10 +157,9 @@ class ConstructorTracker {
|
|||
|
||||
TrackedAddress& tracked_address = it->second;
|
||||
if (!tracked_address.is_alive) {
|
||||
ADD_FAILURE() << "Object at address " << address << " with countdown of "
|
||||
<< current_tracker_instance_->countdown_
|
||||
<< " was re-destroyed or created prior to construction "
|
||||
<< "tracking [" << tracked_address.description << "]";
|
||||
ADD_FAILURE() << ErrorMessage(address, tracked_address.description,
|
||||
current_tracker_instance_->countdown_,
|
||||
"Object was re-destroyed.");
|
||||
}
|
||||
tracked_address.is_alive = false;
|
||||
}
|
||||
|
@ -172,6 +169,16 @@ class ConstructorTracker {
|
|||
return current_tracker_instance_ != nullptr;
|
||||
}
|
||||
|
||||
static std::string ErrorMessage(void* address, const std::string& address_description,
|
||||
int countdown, const std::string& error_description) {
|
||||
return absl::Substitute(
|
||||
"With coundtown at $0:\n"
|
||||
" $1\n"
|
||||
" Object originally constructed by $2\n"
|
||||
" Object address: $3\n",
|
||||
countdown, error_description, address_description, address);
|
||||
}
|
||||
|
||||
std::unordered_map<void*, TrackedAddress> address_map_;
|
||||
int countdown_;
|
||||
|
||||
|
@ -709,7 +716,7 @@ class ThrowingAllocator : private exceptions_internal::TrackedObject {
|
|||
}
|
||||
|
||||
size_type max_size() const noexcept {
|
||||
return std::numeric_limits<difference_type>::max() / sizeof(value_type);
|
||||
return (std::numeric_limits<difference_type>::max)() / sizeof(value_type);
|
||||
}
|
||||
|
||||
ThrowingAllocator select_on_container_copy_construction() noexcept(
|
||||
|
|
|
@ -199,4 +199,14 @@ enum LinkerInitialized {
|
|||
: [] { assert(false && #expr); }()) // NOLINT
|
||||
#endif
|
||||
|
||||
#ifdef ABSL_HAVE_EXCEPTIONS
|
||||
#define ABSL_INTERNAL_TRY try
|
||||
#define ABSL_INTERNAL_CATCH_ANY catch (...)
|
||||
#define ABSL_INTERNAL_RETHROW do { throw; } while (false)
|
||||
#else // ABSL_HAVE_EXCEPTIONS
|
||||
#define ABSL_INTERNAL_TRY if (true)
|
||||
#define ABSL_INTERNAL_CATCH_ANY else if (false)
|
||||
#define ABSL_INTERNAL_RETHROW do {} while (false)
|
||||
#endif // ABSL_HAVE_EXCEPTIONS
|
||||
|
||||
#endif // ABSL_BASE_MACROS_H_
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue