include the section size into the warning about address overrun

Author: kikairoya

llvm/test/tools/llvm-readobj/COFF/pseudoreloc.test

@@ -6,6 +6,7 @@ DEFINE: %{sym1_x64} = 0x20E8
 DEFINE: %{sym3_x64} = 0x20D8
 DEFINE: %{relocbegin} = 8
 DEFINE: %{relocend} = 80
+DEFINE: %{rdatasize} = 254
 
 RUN: yaml2obj  -o %t.exe-x86_64 %p/Inputs/pseudoreloc.x86_64.yaml
 RUN: llvm-readobj %t.exe-x86_64 --coff-pseudoreloc 2>&1 | \
@@ -81,7 +82,7 @@ INVALIDSYMBOL-NEXT: Target: 0x[[#%X,LOCAL1A+8]]
 
 ; Assume the position of the section and the relocation list for further tests.
 RUN: FileCheck --input-file=%p/Inputs/pseudoreloc.i386.yaml %s --check-prefix=RELOCPOS --match-full-lines \
-RUN:   -DTHEBEGIN=%{relocbegin} -DTHEEND=%{relocend}
+RUN:   -D#RDATASIZE=%{rdatasize} -DTHEBEGIN=%{relocbegin} -DTHEEND=%{relocend}
 
 RELOCPOS:     sections:
 RELOCPOS-NOT:   - Name:
@@ -90,6 +91,7 @@ RELOCPOS-NOT:   - Name:
 RELOCPOS:       - Name:            .rdata
 RELOCPOS-NEXT:    Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ ]
 RELOCPOS-NEXT:    VirtualAddress:  8192
+RELOCPOS-NEXT:    VirtualSize:     [[#%d,RDATASIZE]]
 RELOCPOS:       - Name:            .data
 RELOCPOS-NEXT:    Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ, IMAGE_SCN_MEM_WRITE ]
 RELOCPOS-NEXT:    VirtualAddress:  12288
@@ -143,11 +145,11 @@ RUN:   FileCheck %s --check-prefixes=EMPTY,WARN-LOWEREND -D#BEGIN=%{relocend} -D
 ; Test that llvm-readobj warns if the marker symbol points out of the section space.
 RUN: yaml2obj  -o %t.outofrange-both.exe-i386 %p/Inputs/pseudoreloc.i386.yaml -DBEGIN=8888 -DEND=9999
 RUN: llvm-readobj %t.outofrange-both.exe-i386 --coff-pseudoreloc 2>&1 | \
-RUN:   FileCheck %s --check-prefixes=EMPTY,WARN-OUTOFRANGE --match-full-lines
+RUN:   FileCheck %s --check-prefixes=EMPTY,WARN-OUTOFRANGE --match-full-lines -D#RDATASIZE=%{rdatasize}
 
 RUN: yaml2obj  -o %t.outofrange-end.exe-i386 %p/Inputs/pseudoreloc.i386.yaml -DEND=8888
 RUN: llvm-readobj %t.outofrange-end.exe-i386 --coff-pseudoreloc 2>&1 | \
-RUN:   FileCheck %s --check-prefixes=EMPTY,WARN-OUTOFRANGE --match-full-lines
+RUN:   FileCheck %s --check-prefixes=EMPTY,WARN-OUTOFRANGE --match-full-lines -D#RDATASIZE=%{rdatasize}
 
 ; Test that llvm-readobj warns if the marker symbols point different sections.
 RUN: yaml2obj  -o %t.section-differs.exe-i386 %p/Inputs/pseudoreloc.i386.yaml -DSECTION_OF_BEGIN=1
@@ -161,7 +163,7 @@ EMPTY-NEXT: PseudoReloc [
 WARN-MISSINGMARKER-NEXT:  {{.*}}warning: {{.*}}: the marker symbols for runtime pseudo-relocation were not found
 WARN-INVALIDHEADER-NEXT:  {{.*}}warning: {{.*}}: invalid runtime pseudo-relocation records
 WARN-LOWEREND-NEXT:       {{.*}}warning: {{.*}}: the end marker symbol for runtime pseudo-relocation must point to a higher address than where the begin marker points to: expected >=0x[[#%x,BEGIN]], but got 0x[[#%x,END]]
-WARN-OUTOFRANGE-NEXT:     {{.*}}warning: {{.*}}: the marker symbol of runtime pseudo-relocation points past the end of the section: 0x[[#%x,8888]]
+WARN-OUTOFRANGE-NEXT:     {{.*}}warning: {{.*}}: the marker symbol of runtime pseudo-relocation points past the end of the section 0x[[#%x,RDATASIZE]]: got 0x[[#%x,8888]]
 WARN-SECTIONDIFFERS-NEXT: {{.*}}warning: {{.*}}: the end marker symbol for runtime pseudo-relocation must point to the same section where the begin marker points to: expected 1, but got {{[2-9]}}
 EMPTY-NEXT: ]
 

llvm/tools/llvm-readobj/COFFDumper.cpp

@@ -2115,8 +2115,8 @@ void COFFDumper::printCOFFPseudoReloc() {
       Begin >= Data.size() || End > Data.size()) {
     reportUniqueWarning(
         createStringError("the marker symbol of runtime pseudo-relocation "
-                          "points past the end of the section: 0x%x",
-                          Begin >= Data.size() ? Begin : End));
+                          "points past the end of the section 0x%x: got 0x%x",
+                          Data.size(), Begin >= Data.size() ? Begin : End));
     return;
   }