[llvm-cvtres] Put resource symbols in .rsrc$02

[sirg3]

Summary

The $RXXXXXX symbols generated by llvm-cvtres need to go in .rsrc$02 instead of .rsrc$01.

[ecbeckmann]

Wow. Good catch. I was wondering why these patches were breaking chromium lld windows bots, and this probably explains it. Thanks a lot!

[ecbeckmann]

Do you think you could submit this soon, or I can submit for you? I'd like to switch the build back to my code path pretty soon if this fixes everything.

[sirg3]

In D34832#796335, @ecbeckmann wrote:

Do you think you could submit this soon, or I can submit for you? I'd like to switch the build back to my code path pretty soon if this fixes everything.

I don't know anything about the Phabricator-driven review system and how things get submitted -- until now I've just sent patches to the commits list. Could you do it?

[ecbeckmann]

In D34832#797033, @sirg3 wrote:

In D34832#796335, @ecbeckmann wrote:

Do you think you could submit this soon, or I can submit for you? I'd like to switch the build back to my code path pretty soon if this fixes everything.

I don't know anything about the Phabricator-driven review system and how things get submitted -- until now I've just sent patches to the commits list. Could you do it?

Ah okay, yes sure.

[ecbeckmann]

Submitted in rL306853.

llvm/trunk/lib/Object/WindowsResource.cpp

void WindowsResourceCOFFWriter::writeSymbolTable() {
 
   // Now write a symbol for each relocation.
   for (unsigned i = 0; i < Data.size(); i++) {
     char RelocationName[9];
     sprintf(RelocationName, "$R%06X", DataOffsets[i]);
     Symbol = reinterpret_cast<coff_symbol16 *>(BufferStart + CurrentOffset);
     strncpy(Symbol->Name.ShortName, RelocationName, (size_t)COFF::NameSize);
     Symbol->Value = DataOffsets[i];
-    Symbol->SectionNumber = 1;
+    Symbol->SectionNumber = 2;
     Symbol->Type = COFF::IMAGE_SYM_DTYPE_NULL;
     Symbol->StorageClass = COFF::IMAGE_SYM_CLASS_STATIC;
     Symbol->NumberOfAuxSymbols = 0;
     CurrentOffset += sizeof(coff_symbol16);
   }
 }
 
 void WindowsResourceCOFFWriter::writeStringTable() {

llvm/trunk/test/tools/llvm-cvtres/symbols.test

+// Check COFF emission of cvtres
+// The input was generated with the following command, using the original Windows
+// rc.exe:
+// > rc /fo test_resource.res /nologo test_resource.rc
+// The object file we are comparing against was generated with this command using
+// the original Windows cvtres.exe.
+// > cvtres /machine:X86 /readonly /nologo /out:test_resource.obj.coff \
+//   test_resource.res
+
+RUN: llvm-cvtres /verbose /out:%t %p/Inputs/test_resource.res
+RUN: llvm-readobj -symbols %t | FileCheck %s
+
+CHECK:        Name: $R000000
+CHECK-NEXT:    Value: 0
+CHECK-NEXT:    Section: .rsrc$02
+CHECK:        Name: $R000018
+CHECK-NEXT:    Value: 24
+CHECK-NEXT:    Section: .rsrc$02
+CHECK:        Name: $R000340
+CHECK-NEXT:    Value: 832
+CHECK-NEXT:    Section: .rsrc$02
+CHECK:        Name: $R000668
+CHECK-NEXT:    Value: 1640
+CHECK-NEXT:    Section: .rsrc$02
+CHECK:        Name: $R000698
+CHECK-NEXT:    Value: 1688
+CHECK-NEXT:    Section: .rsrc$02
+CHECK:        Name: $R000720
+CHECK-NEXT:    Value: 1824
+CHECK-NEXT:    Section: .rsrc$02
+CHECK:        Name: $R000750
+CHECK-NEXT:    Value: 1872
+CHECK-NEXT:    Section: .rsrc$02