Remove constant Wrap method. Remove the unused `constant::Manager::Wrap` method. Change-Id: I648c877736ab8fae8a12520674fb14be49363264 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/259334 Reviewed-by: James Price <jrprice@google.com> Commit-Queue: dan sinclair <dsinclair@chromium.org>
diff --git a/src/tint/lang/core/constant/manager.h b/src/tint/lang/core/constant/manager.h index c0044d7..2b6f774 100644 --- a/src/tint/lang/core/constant/manager.h +++ b/src/tint/lang/core/constant/manager.h
@@ -67,21 +67,6 @@ /// Destructor ~Manager(); - /// Wrap returns a new Manager created with the constants and types of `inner`. - /// The Manager returned by Wrap is intended to temporarily extend the constants and types of an - /// existing immutable Manager. As the copied constants and types are owned by `inner`, `inner` - /// must not be destructed or assigned while using the returned Manager. - /// TODO(crbug.com/tint/460) - Evaluate whether there are safer alternatives to this - /// function. - /// @param inner the immutable Manager to extend - /// @return the Manager that wraps `inner` - static Manager Wrap(const Manager& inner) { - Manager out; - out.values_.Wrap(inner.values_); - out.types = core::type::Manager::Wrap(inner.types); - return out; - } - /// @param args the arguments used to construct the type, unique node or node. /// @return a pointer to an instance of `T` with the provided arguments. /// If NODE derives from UniqueNode and an existing instance of `T` has been
diff --git a/src/tint/lang/core/constant/manager_test.cc b/src/tint/lang/core/constant/manager_test.cc index c0f9f83..38432e1 100644 --- a/src/tint/lang/core/constant/manager_test.cc +++ b/src/tint/lang/core/constant/manager_test.cc
@@ -46,16 +46,6 @@ using namespace tint::core::number_suffixes; // NOLINT -template <typename T> -size_t count(const T& range_loopable) { - size_t n = 0; - for (auto it : range_loopable) { - (void)it; - n++; - } - return n; -} - using ManagerTest = testing::Test; TEST_F(ManagerTest, GetUnregistered) { @@ -196,35 +186,5 @@ EXPECT_EQ(c->value, 1_a); } -TEST_F(ManagerTest, WrapDoesntAffectInner_Constant) { - Manager inner; - Manager outer = Manager::Wrap(inner); - - inner.Get(1_i); - - EXPECT_EQ(count(inner), 1u); - EXPECT_EQ(count(outer), 0u); - - outer.Get(1_i); - - EXPECT_EQ(count(inner), 1u); - EXPECT_EQ(count(outer), 1u); -} - -TEST_F(ManagerTest, WrapDoesntAffectInner_Types) { - Manager inner; - Manager outer = Manager::Wrap(inner); - - inner.types.Get<core::type::I32>(); - - EXPECT_EQ(count(inner.types), 1u); - EXPECT_EQ(count(outer.types), 0u); - - outer.types.Get<core::type::U32>(); - - EXPECT_EQ(count(inner.types), 1u); - EXPECT_EQ(count(outer.types), 1u); -} - } // namespace } // namespace tint::core::constant