[applied] reporter-priv: Fix a thinko in sub-range change report

diff --git a/src/abg-reporter-priv.cc b/src/abg-reporter-priv.cc
index 674962e6..09a8a599 100644
--- a/src/abg-reporter-priv.cc
+++ b/src/abg-reporter-priv.cc
@@ -763,7 +763,7 @@  represent(const subrange_diff&		d,
 
   if (oub != nub)
     {
-      out << indent << "upper bound of '" << nr  << "' change from '";
+      out << indent << "upper bound of '" << oor  << "' change from '";
       emit_num_value(oub, *ctxt, out);
       out << "' to '";
       emit_num_value(nub, *ctxt, out);
diff --git a/tests/data/test-abidiff-exit/ada-subrange/test1-ada-subrange/test1-ada-subrange-report-1.txt b/tests/data/test-abidiff-exit/ada-subrange/test1-ada-subrange/test1-ada-subrange-report-1.txt
index 86abfb9e..1ca7d2f1 100644
--- a/tests/data/test-abidiff-exit/ada-subrange/test1-ada-subrange/test1-ada-subrange-report-1.txt
+++ b/tests/data/test-abidiff-exit/ada-subrange/test1-ada-subrange/test1-ada-subrange-report-1.txt
@@ -9,9 +9,9 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       array type size changed from 96 to 112
       array type subrange 1 changed length from 6 to 7
       array subrange changed: 
-        upper bound of '<anonymous range>[7]' change from '5' to '6'
+        upper bound of '<anonymous range>[6]' change from '5' to '6'
 
   [C] 'function test1__my_index test1__second_function(void)' at test1.adb:14:1 has some indirect sub-type changes:
     return type changed:
-      upper bound of '<range test1__my_index>[7]' change from '5' to '6'
+      upper bound of '<range test1__my_index>[6]' change from '5' to '6'
 
diff --git a/tests/data/test-abidiff-exit/ada-subrange/test1-ada-subrange/test1-ada-subrange-report-2.txt b/tests/data/test-abidiff-exit/ada-subrange/test1-ada-subrange/test1-ada-subrange-report-2.txt
index 5a07659b..3dc9b554 100644
--- a/tests/data/test-abidiff-exit/ada-subrange/test1-ada-subrange/test1-ada-subrange-report-2.txt
+++ b/tests/data/test-abidiff-exit/ada-subrange/test1-ada-subrange/test1-ada-subrange-report-2.txt
@@ -13,7 +13,7 @@  Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
 
   [C] 'function test1__my_index test1__second_function(void)' at test1.adb:14:1 has some sub-type changes:
     return type changed:
-      upper bound of '<range test1__my_index>[7]' change from '5' to '6'
+      upper bound of '<range test1__my_index>[6]' change from '5' to '6'
 
 '<range test1__my_index>[6]' changed:
-  upper bound of '<range test1__my_index>[7]' change from '5' to '6'
+  upper bound of '<range test1__my_index>[6]' change from '5' to '6'
diff --git a/tests/data/test-abidiff-exit/ada-subrange/test2-ada-subrange-redundant/test2-ada-subrange-redundant-report-1.txt b/tests/data/test-abidiff-exit/ada-subrange/test2-ada-subrange-redundant/test2-ada-subrange-redundant-report-1.txt
index c3cf07bb..eaf3e83f 100644
--- a/tests/data/test-abidiff-exit/ada-subrange/test2-ada-subrange-redundant/test2-ada-subrange-redundant-report-1.txt
+++ b/tests/data/test-abidiff-exit/ada-subrange/test2-ada-subrange-redundant/test2-ada-subrange-redundant-report-1.txt
@@ -9,13 +9,13 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       array type size changed from 1616 to 3216
       array type subrange 1 changed length from 101 to 201
       array subrange changed: 
-        upper bound of '<anonymous range>[201]' change from '100' to '200'
+        upper bound of '<anonymous range>[101]' change from '100' to '200'
         underlying type of range '<anonymous range>[101]' changed:
           type size changed from 8 to 16 (in bits)
 
   [C] 'function test__my_index test__second_function(const test__my_index)' at test.adb:12:1 has some indirect sub-type changes:
     return type changed:
-      upper bound of '<range test__my_index>[201]' change from '100' to '200'
+      upper bound of '<range test__my_index>[101]' change from '100' to '200'
       underlying type of range '<range test__my_index>[101]' changed:
         type size changed from 8 to 16 (in bits)
 
diff --git a/tests/data/test-abidiff-exit/ada-subrange/test2-ada-subrange-redundant/test2-ada-subrange-redundant-report-2.txt b/tests/data/test-abidiff-exit/ada-subrange/test2-ada-subrange-redundant/test2-ada-subrange-redundant-report-2.txt
index f24366d7..8c395571 100644
--- a/tests/data/test-abidiff-exit/ada-subrange/test2-ada-subrange-redundant/test2-ada-subrange-redundant-report-2.txt
+++ b/tests/data/test-abidiff-exit/ada-subrange/test2-ada-subrange-redundant/test2-ada-subrange-redundant-report-2.txt
@@ -13,12 +13,12 @@  Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
 
   [C] 'function test__my_index test__second_function(const test__my_index)' at test.adb:12:1 has some sub-type changes:
     return type changed:
-      upper bound of '<range test__my_index>[201]' change from '100' to '200'
+      upper bound of '<range test__my_index>[101]' change from '100' to '200'
     parameter 1 of type 'const test__my_index' changed:
       in unqualified underlying type '<range test__my_index>[101]':
-        upper bound of '<range test__my_index>[201]' change from '100' to '200'
+        upper bound of '<range test__my_index>[101]' change from '100' to '200'
 
 'test__Tmy_indexB' changed:
   type size changed from 8 to 16 (in bits)
 '<range test__my_index>[101]' changed:
-  upper bound of '<range test__my_index>[201]' change from '100' to '200'
+  upper bound of '<range test__my_index>[101]' change from '100' to '200'
diff --git a/tests/data/test-abidiff-exit/test-allow-type-array-v0--v1-report-1.txt b/tests/data/test-abidiff-exit/test-allow-type-array-v0--v1-report-1.txt
index f4324c0a..300dbb90 100644
--- a/tests/data/test-abidiff-exit/test-allow-type-array-v0--v1-report-1.txt
+++ b/tests/data/test-abidiff-exit/test-allow-type-array-v0--v1-report-1.txt
@@ -15,7 +15,7 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
             array type size changed from 400 to 368
             array type subrange 1 changed length from 50 to 46
             array subrange changed: 
-              upper bound of '<anonymous range>[46]' change from '49' to '45'
+              upper bound of '<anonymous range>[50]' change from '49' to '45'
           and offset changed from 64 to 96 (in bits) (by +32 bits)
     parameter 2 of type 'C1*' has sub-type changes:
       in pointed to type 'struct C1' at test-allow-type-array-v1.c:9:1:
diff --git a/tests/data/test-abidiff-exit/test-allow-type-array-v0--v3-report-1.txt b/tests/data/test-abidiff-exit/test-allow-type-array-v0--v3-report-1.txt
index f00349e7..1f6ca132 100644
--- a/tests/data/test-abidiff-exit/test-allow-type-array-v0--v3-report-1.txt
+++ b/tests/data/test-abidiff-exit/test-allow-type-array-v0--v3-report-1.txt
@@ -15,7 +15,7 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
             array type size changed from 400 to 368
             array type subrange 1 changed length from 50 to 46
             array subrange changed: 
-              upper bound of '<anonymous range>[46]' change from '49' to '45'
+              upper bound of '<anonymous range>[50]' change from '49' to '45'
           and offset changed from 64 to 96 (in bits) (by +32 bits)
     parameter 2 of type 'C1*' has sub-type changes:
       in pointed to type 'struct C1' at test-allow-type-array-v3.c:9:1:
diff --git a/tests/data/test-abidiff/test-PR27985-report.txt b/tests/data/test-abidiff/test-PR27985-report.txt
index 05d8d63b..037e28a3 100644
--- a/tests/data/test-abidiff/test-PR27985-report.txt
+++ b/tests/data/test-abidiff/test-PR27985-report.txt
@@ -17,5 +17,5 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
                   array type size changed from 64 to 96
                   array type subrange 1 changed length from 2 to 3
                   array subrange changed: 
-                    upper bound of '<anonymous range>[3]' change from '1' to '2'
+                    upper bound of '<anonymous range>[2]' change from '1' to '2'
 
diff --git a/tests/data/test-diff-dwarf/test10-report.txt b/tests/data/test-diff-dwarf/test10-report.txt
index 82736e8a..ce14bdda 100644
--- a/tests/data/test-diff-dwarf/test10-report.txt
+++ b/tests/data/test-diff-dwarf/test10-report.txt
@@ -13,7 +13,7 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
             array type size changed from 480 to 640
             array type subrange 2 changed length from 3 to 4
             array subrange 2 changed: 
-              upper bound of '<anonymous range>[4]' change from '2' to '3'
+              upper bound of '<anonymous range>[3]' change from '2' to '3'
           type of 'int* m1[10]' changed:
             array element type 'int*' changed:
               in pointed to type 'int':
diff --git a/tests/data/test-diff-dwarf/test11-report.txt b/tests/data/test-diff-dwarf/test11-report.txt
index 793d6054..6acc71be 100644
--- a/tests/data/test-diff-dwarf/test11-report.txt
+++ b/tests/data/test-diff-dwarf/test11-report.txt
@@ -13,12 +13,12 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
             array type size changed from 480 to 576
             array type subrange 1 changed length from 5 to 6
             array subrange 1 changed: 
-              upper bound of '<anonymous range>[6]' change from '4' to '5'
+              upper bound of '<anonymous range>[5]' change from '4' to '5'
           type of 'int m1[6][4]' changed:
             type name changed from 'int[6][4]' to 'int[6][5]'
             array type size changed from 768 to 960
             array type subrange 2 changed length from 4 to 5
             array subrange 2 changed: 
-              upper bound of '<anonymous range>[5]' change from '3' to '4'
+              upper bound of '<anonymous range>[4]' change from '3' to '4'
           and offset changed from 480 to 576 (in bits) (by +96 bits)
 
diff --git a/tests/data/test-diff-dwarf/test35-pr19173-libfoo-long-clang-report-0.txt b/tests/data/test-diff-dwarf/test35-pr19173-libfoo-long-clang-report-0.txt
index 3f0acd1a..8f7ae28d 100644
--- a/tests/data/test-diff-dwarf/test35-pr19173-libfoo-long-clang-report-0.txt
+++ b/tests/data/test-diff-dwarf/test35-pr19173-libfoo-long-clang-report-0.txt
@@ -10,5 +10,5 @@  Variables changes summary: 0 Removed, 1 Changed, 0 Added variable
       array type size changed from 40 to 80
       array type subrange 1 changed length from 5 to 10
       array subrange changed: 
-        upper bound of '<anonymous range>[10]' change from '4' to '9'
+        upper bound of '<anonymous range>[5]' change from '4' to '9'
 
diff --git a/tests/data/test-diff-dwarf/test35-pr19173-libfoo-long-gcc-report-0.txt b/tests/data/test-diff-dwarf/test35-pr19173-libfoo-long-gcc-report-0.txt
index 3f0acd1a..8f7ae28d 100644
--- a/tests/data/test-diff-dwarf/test35-pr19173-libfoo-long-gcc-report-0.txt
+++ b/tests/data/test-diff-dwarf/test35-pr19173-libfoo-long-gcc-report-0.txt
@@ -10,5 +10,5 @@  Variables changes summary: 0 Removed, 1 Changed, 0 Added variable
       array type size changed from 40 to 80
       array type subrange 1 changed length from 5 to 10
       array subrange changed: 
-        upper bound of '<anonymous range>[10]' change from '4' to '9'
+        upper bound of '<anonymous range>[5]' change from '4' to '9'
 
diff --git a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt
index fddf7a27..7038b617 100644
--- a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt
+++ b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt
@@ -1199,7 +1199,7 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
             array type size changed from 384 to 448
             array type subrange 1 changed length from 6 to 7
             array subrange changed: 
-              upper bound of '<anonymous range>[7]' change from '5' to '6'
+              upper bound of '<anonymous range>[6]' change from '5' to '6'
           and offset changed from 2368 to 5056 (in bits) (by +2688 bits)
 
   [C] 'method void OffloadDescriptor::cleanup()' has some indirect sub-type changes:
diff --git a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt
index 99713c01..14ac3c62 100644
--- a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt
+++ b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt
@@ -1199,7 +1199,7 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
             array type size changed from 384 to 448
             array type subrange 1 changed length from 6 to 7
             array subrange changed: 
-              upper bound of '<anonymous range>[7]' change from '5' to '6'
+              upper bound of '<anonymous range>[6]' change from '5' to '6'
           and offset changed from 2368 to 5056 (in bits) (by +2688 bits)
 
   [C] 'method void OffloadDescriptor::cleanup()' at offload_host.cpp:2294:1 has some indirect sub-type changes:
diff --git a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt
index beea2f73..d21b6630 100644
--- a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt
+++ b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt
@@ -1199,7 +1199,7 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
             array type size changed from 0x180 to 0x1c0
             array type subrange 1 changed length from 6 to 7
             array subrange changed: 
-              upper bound of '<anonymous range>[7]' change from '0x5' to '0x6'
+              upper bound of '<anonymous range>[6]' change from '0x5' to '0x6'
           and offset changed from 0x128 to 0x278 (in bytes) (by +0x150 bytes)
 
   [C] 'method void OffloadDescriptor::cleanup()' at offload_host.cpp:2294:1 has some indirect sub-type changes:
diff --git a/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt b/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt
index 6d9de63d..c9d74423 100644
--- a/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt
+++ b/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt
@@ -115,7 +115,7 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
             array type size changed from 384 to 448
             array type subrange 1 changed length from 6 to 7
             array subrange changed: 
-              upper bound of '<anonymous range>[7]' change from '5' to '6'
+              upper bound of '<anonymous range>[6]' change from '5' to '6'
           and offset changed from 2368 to 5056 (in bits) (by +2688 bits)
 
   [C] 'method void OffloadDescriptor::cleanup()' has some indirect sub-type changes:
diff --git a/tests/data/test-diff-pkg/nss-3.23.0-1.0.fc23.x86_64-report-0.txt b/tests/data/test-diff-pkg/nss-3.23.0-1.0.fc23.x86_64-report-0.txt
index baa151cb..5b8dbf61 100644
--- a/tests/data/test-diff-pkg/nss-3.23.0-1.0.fc23.x86_64-report-0.txt
+++ b/tests/data/test-diff-pkg/nss-3.23.0-1.0.fc23.x86_64-report-0.txt
@@ -65,7 +65,7 @@ 
         array type size changed from 1184 to 1104
         array type subrange 1 changed length from 74 to 69
         array subrange changed: 
-          upper bound of '<anonymous range>[69]' change from '73' to '68'
+          upper bound of '<anonymous range>[74]' change from '73' to '68'
 
 ================ end of changes of 'libssl3.so'===============
 
diff --git a/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt b/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt
index 90b6af38..a592c681 100644
--- a/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt
+++ b/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt
@@ -43,7 +43,7 @@ 
                       array type size changed from 640 to 576
                       array type subrange 1 changed length from 80 to 72
                       array subrange changed: 
-                        upper bound of '<anonymous range>[72]' change from '79' to '71'
+                        upper bound of '<anonymous range>[80]' change from '79' to '71'
                     type of 'generic_scheduler* my_owner' changed:
                       in pointed to type 'class tbb::internal::generic_scheduler' at scheduler.h:110:1:
                         type size changed from 3136 to 3072 (in bits)
diff --git a/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-1.txt b/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-1.txt
index dbb20d7a..91988c5b 100644
--- a/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-1.txt
+++ b/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-1.txt
@@ -43,7 +43,7 @@ 
                       array type size changed from 640 to 576
                       array type subrange 1 changed length from 80 to 72
                       array subrange changed: 
-                        upper bound of '<anonymous range>[72]' change from '79' to '71'
+                        upper bound of '<anonymous range>[80]' change from '79' to '71'
 
     [C] 'method void tbb::internal::concurrent_vector_base_v3::internal_assign(const tbb::internal::concurrent_vector_base_v3&, tbb::internal::concurrent_vector_base_v3::size_type, tbb::internal::concurrent_vector_base_v3::internal_array_op1, tbb::internal::concurrent_vector_base_v3::internal_array_op2, tbb::internal::concurrent_vector_base_v3::internal_array_op2)' at concurrent_vector.cpp:374:1 has some indirect sub-type changes:
       implicit parameter 0 of type 'tbb::internal::concurrent_vector_base_v3*' has sub-type changes:
diff --git a/tests/data/test-diff-suppr/test-has-data-member-inserted-at-1-report-1.txt b/tests/data/test-diff-suppr/test-has-data-member-inserted-at-1-report-1.txt
index dc7a6aff..92ccf901 100644
--- a/tests/data/test-diff-suppr/test-has-data-member-inserted-at-1-report-1.txt
+++ b/tests/data/test-diff-suppr/test-has-data-member-inserted-at-1-report-1.txt
@@ -14,6 +14,6 @@  Unreachable types summary: 0 removed, 1 changed, 0 added type
         array type size changed from 64 to 32
         array type subrange 1 changed length from 8 to 4
         array subrange changed: 
-          upper bound of '<anonymous range>[4]' change from '7' to '3'
+          upper bound of '<anonymous range>[8]' change from '7' to '3'
       and offset changed from 0 to 32 (in bits) (by +32 bits)