[clang] 82057e3 - clang: Fix minor grammar-o in diag added in c354b2e3b

[Nico Weber via cfe-commits]

Author: Nico Weber
Date: 2020-08-13T10:06:40-04:00
New Revision: 82057e3f39e624dbaa5bbd7497c359f704347f6f

URL: https://github.com/llvm/llvm-project/commit/82057e3f39e624dbaa5bbd7497c359f704347f6f
DIFF: https://github.com/llvm/llvm-project/commit/82057e3f39e624dbaa5bbd7497c359f704347f6f.diff

LOG: clang: Fix minor grammar-o in diag added in c354b2e3b

Added: 
    

Modified: 
    clang/include/clang/Basic/DiagnosticSemaKinds.td
    clang/test/Modules/namespaces.cpp
    clang/test/SemaCXX/elaborated-type-specifier.cpp
    clang/test/SemaCXX/pointer-forward-declared-class-conversion.cpp

Removed: 
    


################################################################################
diff  --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td
index e3edddf6a3f2..fd21285b1f79 100644
--- a/clang/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td
@@ -2006,7 +2006,7 @@ def err_init_conversion_failed : Error<
   "|: 
diff erent qualifiers (%5 vs %6)"
   "|: 
diff erent exception specifications}4">;
 def note_forward_class_conversion : Note<"%0 is not defined, but forward "
-  "declared here; conversion would be valid if it's derived from %1">;
+  "declared here; conversion would be valid if it was derived from %1">;
 
 def err_lvalue_to_rvalue_ref : Error<"rvalue reference %
diff {to type $ cannot "
   "bind to lvalue of type $|cannot bind to incompatible lvalue}0,1">;

diff  --git a/clang/test/Modules/namespaces.cpp b/clang/test/Modules/namespaces.cpp
index 315b1cdeda0a..7e3ce820491e 100644
--- a/clang/test/Modules/namespaces.cpp
+++ b/clang/test/Modules/namespaces.cpp
@@ -78,8 +78,8 @@ void testAnonymousNotMerged() {
 
 // expected-note at Inputs/namespaces-right.h:60 {{passing argument to parameter here}}
 // expected-note at Inputs/namespaces-right.h:67 {{passing argument to parameter here}}
-// expected-note at Inputs/namespaces-left.h:63 {{'N11::(anonymous namespace)::Foo' is not defined, but forward declared here; conversion would be valid if it's derived from 'N11::(anonymous namespace)::Foo'}}
-// expected-note at Inputs/namespaces-left.h:70 {{'N12::(anonymous namespace)::Foo' is not defined, but forward declared here; conversion would be valid if it's derived from 'N12::(anonymous namespace)::Foo'}}
+// expected-note at Inputs/namespaces-left.h:63 {{'N11::(anonymous namespace)::Foo' is not defined, but forward declared here; conversion would be valid if it was derived from 'N11::(anonymous namespace)::Foo'}}
+// expected-note at Inputs/namespaces-left.h:70 {{'N12::(anonymous namespace)::Foo' is not defined, but forward declared here; conversion would be valid if it was derived from 'N12::(anonymous namespace)::Foo'}}
 // Test that bringing in one name from an overload set does not hide the rest.
 void testPartialImportOfOverloadSet() {
   void (*p)() = N13::p;

diff  --git a/clang/test/SemaCXX/elaborated-type-specifier.cpp b/clang/test/SemaCXX/elaborated-type-specifier.cpp
index 06037d865d26..66693ec3d118 100644
--- a/clang/test/SemaCXX/elaborated-type-specifier.cpp
+++ b/clang/test/SemaCXX/elaborated-type-specifier.cpp
@@ -26,7 +26,7 @@ namespace NS {
 }
 
 void test_X_elab(NS::X x) {
-  struct S4 *s4 = 0; // expected-note{{'S4' is not defined, but forward declared here; conversion would be valid if it's derived from 'NS::S4'}}
+  struct S4 *s4 = 0; // expected-note{{'S4' is not defined, but forward declared here; conversion would be valid if it was derived from 'NS::S4'}}
   x.test_elab2(s4); // expected-error{{cannot initialize a parameter of type 'NS::S4 *' with an lvalue of type 'struct S4 *'}}
 }
 

diff  --git a/clang/test/SemaCXX/pointer-forward-declared-class-conversion.cpp b/clang/test/SemaCXX/pointer-forward-declared-class-conversion.cpp
index 606517b51aac..e4fda5118061 100644
--- a/clang/test/SemaCXX/pointer-forward-declared-class-conversion.cpp
+++ b/clang/test/SemaCXX/pointer-forward-declared-class-conversion.cpp
@@ -1,7 +1,7 @@
 // RUN: %clang_cc1 -fsyntax-only -verify %s
 
 class A1 {};
-class B1; // expected-note{{'B1' is not defined, but forward declared here; conversion would be valid if it's derived from 'A1'}}
+class B1; // expected-note{{'B1' is not defined, but forward declared here; conversion would be valid if it was derived from 'A1'}}
 B1 *b1;
 A1 *a1 = b1; // expected-error{{cannot initialize a variable of type 'A1 *' with an lvalue of type 'B1 *'}}