<div dir="ltr">Well, heck. That's awesome and not showing up with my clang.<div><br></div><div>I guess I'll revert mine and the original and we can figure out what's going on. </div><div><br></div><div>Thanks for the heads up!</div><div><br></div><div>-eric</div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Thu, Jul 9, 2020 at 1:37 PM Roman Lebedev <<a href="mailto:lebedev.ri@gmail.com">lebedev.ri@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">This seems to have broken <a href="http://45.33.8.238/win/19452/step_4.txt" rel="noreferrer" target="_blank">http://45.33.8.238/win/19452/step_4.txt</a><br>
<br>
On Thu, Jul 9, 2020 at 9:18 PM Eric Christopher via llvm-commits<br>
<<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>> wrote:<br>
><br>
><br>
> Author: Eric Christopher<br>
> Date: 2020-07-09T11:14:00-07:00<br>
> New Revision: c2827083166cd5150232d8fd3ada3cf8fa8c9ac3<br>
><br>
> URL: <a href="https://github.com/llvm/llvm-project/commit/c2827083166cd5150232d8fd3ada3cf8fa8c9ac3" rel="noreferrer" target="_blank">https://github.com/llvm/llvm-project/commit/c2827083166cd5150232d8fd3ada3cf8fa8c9ac3</a><br>
> DIFF: <a href="https://github.com/llvm/llvm-project/commit/c2827083166cd5150232d8fd3ada3cf8fa8c9ac3.diff" rel="noreferrer" target="_blank">https://github.com/llvm/llvm-project/commit/c2827083166cd5150232d8fd3ada3cf8fa8c9ac3.diff</a><br>
><br>
> LOG: Fix [-Werror,-Wsign-compare] warnings arising from subsection symbols patch.<br>
><br>
> Added:<br>
><br>
><br>
> Modified:<br>
> lld/unittests/MachOTests/MachONormalizedFileBinaryReaderTests.cpp<br>
> lld/unittests/MachOTests/MachONormalizedFileYAMLTests.cpp<br>
><br>
> Removed:<br>
><br>
><br>
><br>
> ################################################################################<br>
> diff --git a/lld/unittests/MachOTests/MachONormalizedFileBinaryReaderTests.cpp b/lld/unittests/MachOTests/MachONormalizedFileBinaryReaderTests.cpp<br>
> index aad5f8afcfdc..07c1d4242e03 100644<br>
> --- a/lld/unittests/MachOTests/MachONormalizedFileBinaryReaderTests.cpp<br>
> +++ b/lld/unittests/MachOTests/MachONormalizedFileBinaryReaderTests.cpp<br>
> @@ -75,7 +75,7 @@ TEST(BinaryReaderTest, empty_obj_x86_64) {<br>
> fromBinary(fileBytes, sizeof(fileBytes), "x86_64");<br>
> EXPECT_EQ(f->arch, lld::MachOLinkingContext::arch_x86_64);<br>
> EXPECT_EQ((int)(f->fileType), MH_OBJECT);<br>
> - EXPECT_EQ((int)(f->flags), MH_SUBSECTIONS_VIA_SYMBOLS);<br>
> + EXPECT_EQ(f->flags, MH_SUBSECTIONS_VIA_SYMBOLS);<br>
> EXPECT_TRUE(f->localSymbols.empty());<br>
> EXPECT_TRUE(f->globalSymbols.empty());<br>
> EXPECT_TRUE(f->undefinedSymbols.empty());<br>
> @@ -106,7 +106,7 @@ TEST(BinaryReaderTest, empty_obj_x86) {<br>
> fromBinary(fileBytes, sizeof(fileBytes), "i386");<br>
> EXPECT_EQ(f->arch, lld::MachOLinkingContext::arch_x86);<br>
> EXPECT_EQ((int)(f->fileType), MH_OBJECT);<br>
> - EXPECT_EQ((int)(f->flags), MH_SUBSECTIONS_VIA_SYMBOLS);<br>
> + EXPECT_EQ(f->flags, MH_SUBSECTIONS_VIA_SYMBOLS);<br>
> EXPECT_TRUE(f->localSymbols.empty());<br>
> EXPECT_TRUE(f->globalSymbols.empty());<br>
> EXPECT_TRUE(f->undefinedSymbols.empty());<br>
> @@ -137,7 +137,7 @@ TEST(BinaryReaderTest, empty_obj_ppc) {<br>
> fromBinary(fileBytes, sizeof(fileBytes), "ppc");<br>
> EXPECT_EQ(f->arch, lld::MachOLinkingContext::arch_ppc);<br>
> EXPECT_EQ((int)(f->fileType), MH_OBJECT);<br>
> - EXPECT_EQ((int)(f->flags), MH_SUBSECTIONS_VIA_SYMBOLS);<br>
> + EXPECT_EQ(f->flags, MH_SUBSECTIONS_VIA_SYMBOLS);<br>
> EXPECT_TRUE(f->localSymbols.empty());<br>
> EXPECT_TRUE(f->globalSymbols.empty());<br>
> EXPECT_TRUE(f->undefinedSymbols.empty());<br>
> @@ -168,7 +168,7 @@ TEST(BinaryReaderTest, empty_obj_armv7) {<br>
> fromBinary(fileBytes, sizeof(fileBytes), "armv7");<br>
> EXPECT_EQ(f->arch, lld::MachOLinkingContext::arch_armv7);<br>
> EXPECT_EQ((int)(f->fileType), MH_OBJECT);<br>
> - EXPECT_EQ((int)(f->flags), MH_SUBSECTIONS_VIA_SYMBOLS);<br>
> + EXPECT_EQ(f->flags, MH_SUBSECTIONS_VIA_SYMBOLS);<br>
> EXPECT_TRUE(f->localSymbols.empty());<br>
> EXPECT_TRUE(f->globalSymbols.empty());<br>
> EXPECT_TRUE(f->undefinedSymbols.empty());<br>
> @@ -182,7 +182,7 @@ TEST(BinaryReaderTest, empty_obj_x86_64_arm7) {<br>
> fromBinary(fileBytes, sizeof(fileBytes), "x86_64");<br>
> EXPECT_EQ(f->arch, lld::MachOLinkingContext::arch_x86_64);<br>
> EXPECT_EQ((int)(f->fileType), MH_OBJECT);<br>
> - EXPECT_EQ((int)(f->flags), MH_SUBSECTIONS_VIA_SYMBOLS);<br>
> + EXPECT_EQ(f->flags, MH_SUBSECTIONS_VIA_SYMBOLS);<br>
> EXPECT_TRUE(f->localSymbols.empty());<br>
> EXPECT_TRUE(f->globalSymbols.empty());<br>
> EXPECT_TRUE(f->undefinedSymbols.empty());<br>
> @@ -191,7 +191,7 @@ TEST(BinaryReaderTest, empty_obj_x86_64_arm7) {<br>
> fromBinary(fileBytes, sizeof(fileBytes), "armv7");<br>
> EXPECT_EQ(f2->arch, lld::MachOLinkingContext::arch_armv7);<br>
> EXPECT_EQ((int)(f2->fileType), MH_OBJECT);<br>
> - EXPECT_EQ((int)(f2->flags), MH_SUBSECTIONS_VIA_SYMBOLS);<br>
> + EXPECT_EQ(f2->flags, MH_SUBSECTIONS_VIA_SYMBOLS);<br>
> EXPECT_TRUE(f2->localSymbols.empty());<br>
> EXPECT_TRUE(f2->globalSymbols.empty());<br>
> EXPECT_TRUE(f2->undefinedSymbols.empty());<br>
> @@ -268,7 +268,7 @@ TEST(BinaryReaderTest, hello_obj_x86_64) {<br>
><br>
> EXPECT_EQ(f->arch, lld::MachOLinkingContext::arch_x86_64);<br>
> EXPECT_EQ((int)(f->fileType), MH_OBJECT);<br>
> - EXPECT_EQ((int)(f->flags), MH_SUBSECTIONS_VIA_SYMBOLS);<br>
> + EXPECT_EQ(f->flags, MH_SUBSECTIONS_VIA_SYMBOLS);<br>
> EXPECT_EQ(f->sections.size(), 2UL);<br>
> const Section& text = f->sections[0];<br>
> EXPECT_TRUE(text.segmentName.equals("__TEXT"));<br>
> @@ -393,7 +393,7 @@ TEST(BinaryReaderTest, hello_obj_x86) {<br>
><br>
> EXPECT_EQ(f->arch, lld::MachOLinkingContext::arch_x86);<br>
> EXPECT_EQ((int)(f->fileType), MH_OBJECT);<br>
> - EXPECT_EQ((int)(f->flags), MH_SUBSECTIONS_VIA_SYMBOLS);<br>
> + EXPECT_EQ(f->flags, MH_SUBSECTIONS_VIA_SYMBOLS);<br>
> EXPECT_EQ(f->sections.size(), 2UL);<br>
> const Section& text = f->sections[0];<br>
> EXPECT_TRUE(text.segmentName.equals("__TEXT"));<br>
> @@ -525,7 +525,7 @@ TEST(BinaryReaderTest, hello_obj_armv7) {<br>
><br>
> EXPECT_EQ(f->arch, lld::MachOLinkingContext::arch_armv7);<br>
> EXPECT_EQ((int)(f->fileType), MH_OBJECT);<br>
> - EXPECT_EQ((int)(f->flags), MH_SUBSECTIONS_VIA_SYMBOLS);<br>
> + EXPECT_EQ(f->flags, MH_SUBSECTIONS_VIA_SYMBOLS);<br>
> EXPECT_EQ(f->sections.size(), 2UL);<br>
> const Section& text = f->sections[0];<br>
> EXPECT_TRUE(text.segmentName.equals("__TEXT"));<br>
> @@ -669,7 +669,7 @@ TEST(BinaryReaderTest, hello_obj_ppc) {<br>
><br>
> EXPECT_EQ(f->arch, lld::MachOLinkingContext::arch_ppc);<br>
> EXPECT_EQ((int)(f->fileType), MH_OBJECT);<br>
> - EXPECT_EQ((int)(f->flags), MH_SUBSECTIONS_VIA_SYMBOLS);<br>
> + EXPECT_EQ(f->flags, MH_SUBSECTIONS_VIA_SYMBOLS);<br>
> EXPECT_EQ(f->sections.size(), 2UL);<br>
> const Section& text = f->sections[0];<br>
> EXPECT_TRUE(text.segmentName.equals("__TEXT"));<br>
><br>
> diff --git a/lld/unittests/MachOTests/MachONormalizedFileYAMLTests.cpp b/lld/unittests/MachOTests/MachONormalizedFileYAMLTests.cpp<br>
> index 6ceb197b4b84..c1445ea7eacd 100644<br>
> --- a/lld/unittests/MachOTests/MachONormalizedFileYAMLTests.cpp<br>
> +++ b/lld/unittests/MachOTests/MachONormalizedFileYAMLTests.cpp<br>
> @@ -50,7 +50,7 @@ TEST(ObjectFileYAML, empty_ppc) {<br>
> "...\n");<br>
> EXPECT_EQ(f->arch, lld::MachOLinkingContext::arch_ppc);<br>
> EXPECT_EQ(f->fileType, llvm::MachO::MH_OBJECT);<br>
> - EXPECT_EQ((int)(f->flags), llvm::MachO::MH_SUBSECTIONS_VIA_SYMBOLS);<br>
> + EXPECT_EQ(f->flags, llvm::MachO::MH_SUBSECTIONS_VIA_SYMBOLS);<br>
> EXPECT_TRUE(f->sections.empty());<br>
> EXPECT_TRUE(f->localSymbols.empty());<br>
> EXPECT_TRUE(f->globalSymbols.empty());<br>
> @@ -66,7 +66,7 @@ TEST(ObjectFileYAML, empty_x86_64) {<br>
> "...\n");<br>
> EXPECT_EQ(f->arch, lld::MachOLinkingContext::arch_x86_64);<br>
> EXPECT_EQ(f->fileType, llvm::MachO::MH_OBJECT);<br>
> - EXPECT_EQ((int)(f->flags), llvm::MachO::MH_SUBSECTIONS_VIA_SYMBOLS);<br>
> + EXPECT_EQ(f->flags, llvm::MachO::MH_SUBSECTIONS_VIA_SYMBOLS);<br>
> EXPECT_TRUE(f->sections.empty());<br>
> EXPECT_TRUE(f->localSymbols.empty());<br>
> EXPECT_TRUE(f->globalSymbols.empty());<br>
> @@ -82,7 +82,7 @@ TEST(ObjectFileYAML, empty_x86) {<br>
> "...\n");<br>
> EXPECT_EQ(f->arch, lld::MachOLinkingContext::arch_x86);<br>
> EXPECT_EQ(f->fileType, llvm::MachO::MH_OBJECT);<br>
> - EXPECT_EQ((int)(f->flags), llvm::MachO::MH_SUBSECTIONS_VIA_SYMBOLS);<br>
> + EXPECT_EQ(f->flags, llvm::MachO::MH_SUBSECTIONS_VIA_SYMBOLS);<br>
> EXPECT_TRUE(f->sections.empty());<br>
> EXPECT_TRUE(f->localSymbols.empty());<br>
> EXPECT_TRUE(f->globalSymbols.empty());<br>
> @@ -98,7 +98,7 @@ TEST(ObjectFileYAML, empty_armv6) {<br>
> "...\n");<br>
> EXPECT_EQ(f->arch, lld::MachOLinkingContext::arch_armv6);<br>
> EXPECT_EQ(f->fileType, llvm::MachO::MH_OBJECT);<br>
> - EXPECT_EQ((int)(f->flags), llvm::MachO::MH_SUBSECTIONS_VIA_SYMBOLS);<br>
> + EXPECT_EQ(f->flags, llvm::MachO::MH_SUBSECTIONS_VIA_SYMBOLS);<br>
> EXPECT_TRUE(f->sections.empty());<br>
> EXPECT_TRUE(f->localSymbols.empty());<br>
> EXPECT_TRUE(f->globalSymbols.empty());<br>
> @@ -114,7 +114,7 @@ TEST(ObjectFileYAML, empty_armv7) {<br>
> "...\n");<br>
> EXPECT_EQ(f->arch, lld::MachOLinkingContext::arch_armv7);<br>
> EXPECT_EQ(f->fileType, llvm::MachO::MH_OBJECT);<br>
> - EXPECT_EQ((int)(f->flags), llvm::MachO::MH_SUBSECTIONS_VIA_SYMBOLS);<br>
> + EXPECT_EQ(f->flags, llvm::MachO::MH_SUBSECTIONS_VIA_SYMBOLS);<br>
> EXPECT_TRUE(f->sections.empty());<br>
> EXPECT_TRUE(f->localSymbols.empty());<br>
> EXPECT_TRUE(f->globalSymbols.empty());<br>
> @@ -130,7 +130,7 @@ TEST(ObjectFileYAML, empty_armv7s) {<br>
> "...\n");<br>
> EXPECT_EQ(f->arch, lld::MachOLinkingContext::arch_armv7s);<br>
> EXPECT_EQ(f->fileType, llvm::MachO::MH_OBJECT);<br>
> - EXPECT_EQ((int)(f->flags), llvm::MachO::MH_SUBSECTIONS_VIA_SYMBOLS);<br>
> + EXPECT_EQ(f->flags, llvm::MachO::MH_SUBSECTIONS_VIA_SYMBOLS);<br>
> EXPECT_TRUE(f->sections.empty());<br>
> EXPECT_TRUE(f->localSymbols.empty());<br>
> EXPECT_TRUE(f->globalSymbols.empty());<br>
> @@ -151,7 +151,7 @@ TEST(ObjectFileYAML, roundTrip) {<br>
> std::unique_ptr<NormalizedFile> f2 = fromYAML(intermediate);<br>
> EXPECT_EQ(f2->arch, lld::MachOLinkingContext::arch_x86_64);<br>
> EXPECT_EQ((int)(f2->fileType), llvm::MachO::MH_OBJECT);<br>
> - EXPECT_EQ((int)(f2->flags), llvm::MachO::MH_SUBSECTIONS_VIA_SYMBOLS);<br>
> + EXPECT_EQ(f2->flags, llvm::MachO::MH_SUBSECTIONS_VIA_SYMBOLS);<br>
> EXPECT_TRUE(f2->sections.empty());<br>
> EXPECT_TRUE(f2->localSymbols.empty());<br>
> EXPECT_TRUE(f2->globalSymbols.empty());<br>
> @@ -275,7 +275,7 @@ TEST(ObjectFileYAML, hello_x86_64) {<br>
> "...\n");<br>
> EXPECT_EQ(f->arch, lld::MachOLinkingContext::arch_x86_64);<br>
> EXPECT_EQ(f->fileType, llvm::MachO::MH_OBJECT);<br>
> - EXPECT_EQ((int)(f->flags), llvm::MachO::MH_SUBSECTIONS_VIA_SYMBOLS);<br>
> + EXPECT_EQ(f->flags, llvm::MachO::MH_SUBSECTIONS_VIA_SYMBOLS);<br>
> EXPECT_EQ(f->sections.size(), 2UL);<br>
><br>
> const Section& sect1 = f->sections[0];<br>
> @@ -405,7 +405,7 @@ TEST(ObjectFileYAML, hello_x86) {<br>
> "...\n");<br>
> EXPECT_EQ(f->arch, lld::MachOLinkingContext::arch_x86);<br>
> EXPECT_EQ(f->fileType, llvm::MachO::MH_OBJECT);<br>
> - EXPECT_EQ((int)(f->flags), llvm::MachO::MH_SUBSECTIONS_VIA_SYMBOLS);<br>
> + EXPECT_EQ(f->flags, llvm::MachO::MH_SUBSECTIONS_VIA_SYMBOLS);<br>
> EXPECT_EQ(f->sections.size(), 2UL);<br>
><br>
> const Section& sect1 = f->sections[0];<br>
> @@ -533,7 +533,7 @@ TEST(ObjectFileYAML, hello_armv6) {<br>
> "...\n");<br>
> EXPECT_EQ(f->arch, lld::MachOLinkingContext::arch_armv6);<br>
> EXPECT_EQ(f->fileType, llvm::MachO::MH_OBJECT);<br>
> - EXPECT_EQ((int)(f->flags), llvm::MachO::MH_SUBSECTIONS_VIA_SYMBOLS);<br>
> + EXPECT_EQ(f->flags, llvm::MachO::MH_SUBSECTIONS_VIA_SYMBOLS);<br>
> EXPECT_EQ(f->sections.size(), 2UL);<br>
><br>
> const Section& sect1 = f->sections[0];<br>
> @@ -673,7 +673,7 @@ TEST(ObjectFileYAML, hello_armv7) {<br>
> "...\n");<br>
> EXPECT_EQ(f->arch, lld::MachOLinkingContext::arch_armv7);<br>
> EXPECT_EQ(f->fileType, llvm::MachO::MH_OBJECT);<br>
> - EXPECT_EQ((int)(f->flags), llvm::MachO::MH_SUBSECTIONS_VIA_SYMBOLS);<br>
> + EXPECT_EQ(f->flags, llvm::MachO::MH_SUBSECTIONS_VIA_SYMBOLS);<br>
> EXPECT_EQ(f->sections.size(), 2UL);<br>
><br>
> const Section& sect1 = f->sections[0];<br>
><br>
><br>
><br>
> _______________________________________________<br>
> llvm-commits mailing list<br>
> <a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
> <a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div>