1 files changed, 1 insertions, 3 deletions
diff --git a/src/google/protobuf/extension_set.cc b/src/google/protobuf/extension_set.cc
index f4786392..274554b5 100644
--- a/src/google/protobuf/extension_set.cc
+++ b/src/google/protobuf/extension_set.cc
@@ -1621,9 +1621,7 @@ PROTOBUF_DEFINE_DEFAULT_REPEATED(bool)
 struct StaticDefaultRepeatedFieldsInitializer {
   StaticDefaultRepeatedFieldsInitializer() {
     InitializeDefaultRepeatedFields();
-  }
-  ~StaticDefaultRepeatedFieldsInitializer() {
-    DestroyDefaultRepeatedFields();
+    OnShutdown(&DestroyDefaultRepeatedFields);
   }
 } static_repeated_fields_initializer;