From eb3ab8c59eaf4d2b652e2c2cb50ef9679feee93a Mon Sep 17 00:00:00 2001 From: Deanna Garcia Date: Fri, 14 May 2021 22:58:57 +0000 Subject: [PATCH 01/11] Add headerfiles to Makefile --- src/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Makefile.am b/src/Makefile.am index 12eb70743bbb..9121a177a349 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -100,6 +100,7 @@ nobase_include_HEADERS = \ google/protobuf/generated_enum_util.h \ google/protobuf/generated_message_reflection.h \ google/protobuf/generated_message_table_driven.h \ + google/protobuf/generated_message_tctable_impl.h \ google/protobuf/generated_message_util.h \ google/protobuf/has_bits.h \ google/protobuf/implicit_weak_message.h \ From f9a60fc8ae0646377fd30d2490d7a8f6045b6754 Mon Sep 17 00:00:00 2001 From: Deanna Garcia Date: Fri, 14 May 2021 23:08:04 +0000 Subject: [PATCH 02/11] Add another header to Makefile --- src/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Makefile.am b/src/Makefile.am index 9121a177a349..ddf1e85f24a3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -100,6 +100,7 @@ nobase_include_HEADERS = \ google/protobuf/generated_enum_util.h \ google/protobuf/generated_message_reflection.h \ google/protobuf/generated_message_table_driven.h \ + google/protobuf/generated_message_tctable_decl.h \ google/protobuf/generated_message_tctable_impl.h \ google/protobuf/generated_message_util.h \ google/protobuf/has_bits.h \ From 76bd17ca5b75486072acf36467b8b0e34555f11e Mon Sep 17 00:00:00 2001 From: Deanna Garcia Date: Fri, 14 May 2021 23:21:52 +0000 Subject: [PATCH 03/11] Add another file to Makefile --- src/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Makefile.am b/src/Makefile.am index ddf1e85f24a3..1a8b628e122b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -102,6 +102,7 @@ nobase_include_HEADERS = \ google/protobuf/generated_message_table_driven.h \ google/protobuf/generated_message_tctable_decl.h \ google/protobuf/generated_message_tctable_impl.h \ + google/protobuf/generated_message_tctable_impl.inc \ google/protobuf/generated_message_util.h \ google/protobuf/has_bits.h \ google/protobuf/implicit_weak_message.h \ From f44755496fd859785db0830b4940666c829c0c62 Mon Sep 17 00:00:00 2001 From: Deanna Garcia Date: Tue, 18 May 2021 20:44:04 +0000 Subject: [PATCH 04/11] Updating makefile to pass the tests --- src/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 1a8b628e122b..735e3b84149e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -892,7 +892,9 @@ endif no_warning_test.cc: echo "// Generated from Makefile.am" > no_warning_test.cc for FILE in $(nobase_include_HEADERS); do \ - echo "#include <$${FILE}>" >> no_warning_test.cc; \ + if [[ $$FILE != *.inc ]]; then \ + echo "#include <$${FILE}>" >> no_warning_test.cc; \ + fi \ done echo "int main(int, char**) { return 0; }" >> no_warning_test.cc From 6319a23bff3c38123a637e7e955444cb50f19e67 Mon Sep 17 00:00:00 2001 From: Deanna Garcia Date: Thu, 20 May 2021 18:52:08 +0000 Subject: [PATCH 05/11] Run update_file_lists.sh --- cmake/extract_includes.bat.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmake/extract_includes.bat.in b/cmake/extract_includes.bat.in index ad630af51185..3e9418cbfc5f 100644 --- a/cmake/extract_includes.bat.in +++ b/cmake/extract_includes.bat.in @@ -51,6 +51,9 @@ copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\generated_enum_reflec copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\generated_enum_util.h" include\google\protobuf\generated_enum_util.h copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\generated_message_reflection.h" include\google\protobuf\generated_message_reflection.h copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\generated_message_table_driven.h" include\google\protobuf\generated_message_table_driven.h +copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\generated_message_tctable_decl.h" include\google\protobuf\generated_message_tctable_decl.h +copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\generated_message_tctable_impl.h" include\google\protobuf\generated_message_tctable_impl.h +copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\generated_message_tctable_impl.inc" include\google\protobuf\generated_message_tctable_impl.inc copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\generated_message_util.h" include\google\protobuf\generated_message_util.h copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\has_bits.h" include\google\protobuf\has_bits.h copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\implicit_weak_message.h" include\google\protobuf\implicit_weak_message.h From eb57ffe807e0db2c181af620ce919bf2887676a7 Mon Sep 17 00:00:00 2001 From: Deanna Garcia Date: Thu, 20 May 2021 22:23:29 +0000 Subject: [PATCH 06/11] Reverting last change since tests are still failing --- .../generated_message_reflection_unittest.cc | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/src/google/protobuf/generated_message_reflection_unittest.cc b/src/google/protobuf/generated_message_reflection_unittest.cc index b4c013a54cda..cd04ce00a969 100644 --- a/src/google/protobuf/generated_message_reflection_unittest.cc +++ b/src/google/protobuf/generated_message_reflection_unittest.cc @@ -353,6 +353,46 @@ TEST(GeneratedMessageReflectionTest, SwapFieldsOneof) { TestUtil::ExpectOneofSet1(message2); } +TEST(GeneratedMessageReflectionTest, UnsafeShallowSwapFieldsOneof) { + Arena arena; + auto* message1 = Arena::CreateMessage(&arena); + auto* message2 = Arena::CreateMessage(&arena); + TestUtil::SetOneof1(message1); + + std::vector fields; + const Descriptor* descriptor = message1->GetDescriptor(); + for (int i = 0; i < descriptor->field_count(); i++) { + fields.push_back(descriptor->field(i)); + } + GeneratedMessageReflectionTestHelper::UnsafeShallowSwapFields( + message1, message2, fields); + + TestUtil::ExpectOneofClear(*message1); + TestUtil::ExpectOneofSet1(*message2); +} + +TEST(GeneratedMessageReflectionTest, + UnsafeShallowSwapFieldsOneofExpectShallow) { + Arena arena; + auto* message1 = Arena::CreateMessage(&arena); + auto* message2 = Arena::CreateMessage(&arena); + TestUtil::SetOneof1(message1); + message1->mutable_foo_message()->set_qux_int(1000); + auto* kept_foo_ptr = message1->mutable_foo_message(); + + std::vector fields; + const Descriptor* descriptor = message1->GetDescriptor(); + for (int i = 0; i < descriptor->field_count(); i++) { + fields.push_back(descriptor->field(i)); + } + GeneratedMessageReflectionTestHelper::UnsafeShallowSwapFields( + message1, message2, fields); + + EXPECT_TRUE(message2->has_foo_message()); + EXPECT_EQ(message2->foo_message().qux_int(), 1000); + EXPECT_EQ(kept_foo_ptr, message2->mutable_foo_message()); +} + TEST(GeneratedMessageReflectionTest, RemoveLast) { unittest::TestAllTypes message; TestUtil::ReflectionTester reflection_tester( From 2f8d310048f38ea90cad5e78cbd23f27d09f61c9 Mon Sep 17 00:00:00 2001 From: Deanna Garcia Date: Mon, 24 May 2021 19:28:04 +0000 Subject: [PATCH 07/11] Fixing objc tests --- objectivec/Tests/GPBDescriptorTests.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/objectivec/Tests/GPBDescriptorTests.m b/objectivec/Tests/GPBDescriptorTests.m index 6fa7202bc46f..bdcc2e893c57 100644 --- a/objectivec/Tests/GPBDescriptorTests.m +++ b/objectivec/Tests/GPBDescriptorTests.m @@ -305,7 +305,7 @@ - (void)testOneofDescriptor { GPBDescriptor *descriptor = [TestOneof2 descriptor]; // All fields should be listed. - XCTAssertEqual(descriptor.fields.count, 17U); + XCTAssertEqual(descriptor.fields.count, 21U); // There are two oneofs in there. XCTAssertEqual(descriptor.oneofs.count, 2U); @@ -330,7 +330,7 @@ - (void)testOneofDescriptor { GPBOneofDescriptor *oneofBar = [descriptor oneofWithName:@"bar"]; XCTAssertNotNil(oneofBar); - XCTAssertEqual(oneofBar.fields.count, 6U); + XCTAssertEqual(oneofBar.fields.count, 10U); // Pointer comparisons. XCTAssertEqual([oneofBar fieldWithNumber:TestOneof2_FieldNumber_BarString], From 021329b7e79a387c7b2cc5d483dd36a55c4c5014 Mon Sep 17 00:00:00 2001 From: Deanna Garcia Date: Tue, 25 May 2021 17:27:07 +0000 Subject: [PATCH 08/11] resolving conflicts --- java/kotlin-lite/pom.xml | 17 ----------------- java/kotlin/pom.xml | 16 ---------------- 2 files changed, 33 deletions(-) diff --git a/java/kotlin-lite/pom.xml b/java/kotlin-lite/pom.xml index c7201ae20b54..4c7361ba6c0a 100644 --- a/java/kotlin-lite/pom.xml +++ b/java/kotlin-lite/pom.xml @@ -8,7 +8,6 @@ protobuf-kotlin-lite - bundle Protocol Buffers [Lite] @@ -263,22 +262,6 @@ - - - - org.apache.felix - maven-bundle-plugin - true - - - com.google.protobuf - https://developers.google.com/protocol-buffers/ - com.google.protobuf - com.google.protobuf;version=${project.version} - sun.misc;resolution:=optional,* - - - diff --git a/java/kotlin/pom.xml b/java/kotlin/pom.xml index cf48a1c34313..23f515d19c14 100644 --- a/java/kotlin/pom.xml +++ b/java/kotlin/pom.xml @@ -8,7 +8,6 @@ protobuf-kotlin - bundle Protocol Buffers [Core] @@ -219,21 +218,6 @@ - - - org.apache.felix - maven-bundle-plugin - true - - - com.google.protobuf - https://developers.google.com/protocol-buffers/ - com.google.protobuf - com.google.protobuf;version=${project.version} - sun.misc;resolution:=optional,* - - - From 713f2d0008c97b52f69c6164b750ee9b4b85a643 Mon Sep 17 00:00:00 2001 From: Deanna Garcia Date: Tue, 25 May 2021 17:33:14 +0000 Subject: [PATCH 09/11] Removing files that were added during rebasing --- cmake/extract_includes.bat.in | 3 -- src/Makefile.am | 7 +--- .../generated_message_reflection_unittest.cc | 40 ------------------- 3 files changed, 1 insertion(+), 49 deletions(-) diff --git a/cmake/extract_includes.bat.in b/cmake/extract_includes.bat.in index 3e9418cbfc5f..ad630af51185 100644 --- a/cmake/extract_includes.bat.in +++ b/cmake/extract_includes.bat.in @@ -51,9 +51,6 @@ copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\generated_enum_reflec copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\generated_enum_util.h" include\google\protobuf\generated_enum_util.h copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\generated_message_reflection.h" include\google\protobuf\generated_message_reflection.h copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\generated_message_table_driven.h" include\google\protobuf\generated_message_table_driven.h -copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\generated_message_tctable_decl.h" include\google\protobuf\generated_message_tctable_decl.h -copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\generated_message_tctable_impl.h" include\google\protobuf\generated_message_tctable_impl.h -copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\generated_message_tctable_impl.inc" include\google\protobuf\generated_message_tctable_impl.inc copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\generated_message_util.h" include\google\protobuf\generated_message_util.h copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\has_bits.h" include\google\protobuf\has_bits.h copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\implicit_weak_message.h" include\google\protobuf\implicit_weak_message.h diff --git a/src/Makefile.am b/src/Makefile.am index 735e3b84149e..66f8665cb134 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -100,9 +100,6 @@ nobase_include_HEADERS = \ google/protobuf/generated_enum_util.h \ google/protobuf/generated_message_reflection.h \ google/protobuf/generated_message_table_driven.h \ - google/protobuf/generated_message_tctable_decl.h \ - google/protobuf/generated_message_tctable_impl.h \ - google/protobuf/generated_message_tctable_impl.inc \ google/protobuf/generated_message_util.h \ google/protobuf/has_bits.h \ google/protobuf/implicit_weak_message.h \ @@ -892,9 +889,7 @@ endif no_warning_test.cc: echo "// Generated from Makefile.am" > no_warning_test.cc for FILE in $(nobase_include_HEADERS); do \ - if [[ $$FILE != *.inc ]]; then \ - echo "#include <$${FILE}>" >> no_warning_test.cc; \ - fi \ + echo "#include <$${FILE}>" >> no_warning_test.cc; \ done echo "int main(int, char**) { return 0; }" >> no_warning_test.cc diff --git a/src/google/protobuf/generated_message_reflection_unittest.cc b/src/google/protobuf/generated_message_reflection_unittest.cc index cd04ce00a969..b4c013a54cda 100644 --- a/src/google/protobuf/generated_message_reflection_unittest.cc +++ b/src/google/protobuf/generated_message_reflection_unittest.cc @@ -353,46 +353,6 @@ TEST(GeneratedMessageReflectionTest, SwapFieldsOneof) { TestUtil::ExpectOneofSet1(message2); } -TEST(GeneratedMessageReflectionTest, UnsafeShallowSwapFieldsOneof) { - Arena arena; - auto* message1 = Arena::CreateMessage(&arena); - auto* message2 = Arena::CreateMessage(&arena); - TestUtil::SetOneof1(message1); - - std::vector fields; - const Descriptor* descriptor = message1->GetDescriptor(); - for (int i = 0; i < descriptor->field_count(); i++) { - fields.push_back(descriptor->field(i)); - } - GeneratedMessageReflectionTestHelper::UnsafeShallowSwapFields( - message1, message2, fields); - - TestUtil::ExpectOneofClear(*message1); - TestUtil::ExpectOneofSet1(*message2); -} - -TEST(GeneratedMessageReflectionTest, - UnsafeShallowSwapFieldsOneofExpectShallow) { - Arena arena; - auto* message1 = Arena::CreateMessage(&arena); - auto* message2 = Arena::CreateMessage(&arena); - TestUtil::SetOneof1(message1); - message1->mutable_foo_message()->set_qux_int(1000); - auto* kept_foo_ptr = message1->mutable_foo_message(); - - std::vector fields; - const Descriptor* descriptor = message1->GetDescriptor(); - for (int i = 0; i < descriptor->field_count(); i++) { - fields.push_back(descriptor->field(i)); - } - GeneratedMessageReflectionTestHelper::UnsafeShallowSwapFields( - message1, message2, fields); - - EXPECT_TRUE(message2->has_foo_message()); - EXPECT_EQ(message2->foo_message().qux_int(), 1000); - EXPECT_EQ(kept_foo_ptr, message2->mutable_foo_message()); -} - TEST(GeneratedMessageReflectionTest, RemoveLast) { unittest::TestAllTypes message; TestUtil::ReflectionTester reflection_tester( From 3f8f6e925d63b1e938987281e3607de136526ee2 Mon Sep 17 00:00:00 2001 From: Deanna Garcia Date: Tue, 25 May 2021 17:35:03 +0000 Subject: [PATCH 10/11] Removing more files that were added during rebasing --- objectivec/Tests/GPBDescriptorTests.m | 4 ++-- src/Makefile.am | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/objectivec/Tests/GPBDescriptorTests.m b/objectivec/Tests/GPBDescriptorTests.m index bdcc2e893c57..6fa7202bc46f 100644 --- a/objectivec/Tests/GPBDescriptorTests.m +++ b/objectivec/Tests/GPBDescriptorTests.m @@ -305,7 +305,7 @@ - (void)testOneofDescriptor { GPBDescriptor *descriptor = [TestOneof2 descriptor]; // All fields should be listed. - XCTAssertEqual(descriptor.fields.count, 21U); + XCTAssertEqual(descriptor.fields.count, 17U); // There are two oneofs in there. XCTAssertEqual(descriptor.oneofs.count, 2U); @@ -330,7 +330,7 @@ - (void)testOneofDescriptor { GPBOneofDescriptor *oneofBar = [descriptor oneofWithName:@"bar"]; XCTAssertNotNil(oneofBar); - XCTAssertEqual(oneofBar.fields.count, 10U); + XCTAssertEqual(oneofBar.fields.count, 6U); // Pointer comparisons. XCTAssertEqual([oneofBar fieldWithNumber:TestOneof2_FieldNumber_BarString], diff --git a/src/Makefile.am b/src/Makefile.am index 66f8665cb134..c584d20ccca6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -889,7 +889,7 @@ endif no_warning_test.cc: echo "// Generated from Makefile.am" > no_warning_test.cc for FILE in $(nobase_include_HEADERS); do \ - echo "#include <$${FILE}>" >> no_warning_test.cc; \ + echo "#include <$${FILE}>" >> no_warning_test.cc; \ done echo "int main(int, char**) { return 0; }" >> no_warning_test.cc From 5fac12fff0358dd944c855d67250bacdb6c92e57 Mon Sep 17 00:00:00 2001 From: Deanna Garcia Date: Tue, 25 May 2021 17:38:17 +0000 Subject: [PATCH 11/11] Reverting the Makefile spacing changes --- src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index c584d20ccca6..12eb70743bbb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -889,7 +889,7 @@ endif no_warning_test.cc: echo "// Generated from Makefile.am" > no_warning_test.cc for FILE in $(nobase_include_HEADERS); do \ - echo "#include <$${FILE}>" >> no_warning_test.cc; \ + echo "#include <$${FILE}>" >> no_warning_test.cc; \ done echo "int main(int, char**) { return 0; }" >> no_warning_test.cc