s/instantate/instantiate/ throughout. NFCI.

The static_assert in "libcxx/include/memory" was the main offender here,
but then I figured I might as well `git grep -i instantat` and fix all
the instances I found. One was in user-facing HTML documentation;
the rest were in comments or tests.

diff --git a/clang-tools-extra/clangd/Diagnostics.cpp b/clang-tools-extra/clangd/Diagnostics.cpp
index a4429a7..db4e2e6 100644 (file)
--- a/clang-tools-extra/clangd/Diagnostics.cpp
+++ b/clang-tools-extra/clangd/Diagnostics.cpp
@@ -186,7 +186,7 @@ const char *getMainFileRange(const Diag &D, const SourceManager &SM,
 
 // Place the diagnostic the main file, rather than the header, if possible:
 //   - for errors in included files, use the #include location
-//   - for errors in template instantiation, use the instantation location
+//   - for errors in template instantiation, use the instantiation location
 // In both cases, add the original header location as a note.
 bool tryMoveToMainFile(Diag &D, FullSourceLoc DiagLoc) {
   const SourceManager &SM = DiagLoc.getManager();

diff --git a/clang/docs/LibASTMatchersReference.html b/clang/docs/LibASTMatchersReference.html
index 9f14ab9..203840c 100644 (file)
--- a/clang/docs/LibASTMatchersReference.html
+++ b/clang/docs/LibASTMatchersReference.html
@@ -89,7 +89,7 @@ mode requires careful consideration and testing to get the desired behavior
 from an AST matcher.
 </p>
 
-<p>In addition, because template instantations are matched in the default mode,
+<p>In addition, because template instantiations are matched in the default mode,
 transformations can be accidentally made to template declarations. Finally,
 because implicit nodes are matched by default, transformations can be made on
 entirely incorrect places in the code.</p>

diff --git a/clang/test/CXX/expr/expr.prim/expr.prim.lambda/templates.cpp b/clang/test/CXX/expr/expr.prim/expr.prim.lambda/templates.cpp
index 2bb75df..7a570e0 100644 (file)
--- a/clang/test/CXX/expr/expr.prim/expr.prim.lambda/templates.cpp
+++ b/clang/test/CXX/expr/expr.prim/expr.prim.lambda/templates.cpp
@@ -115,7 +115,7 @@ namespace p5 {
   template void double_capture(NonConstCopy&);
 }
 
-namespace NonLocalLambdaInstantation {
+namespace NonLocalLambdaInstantiation {
   template<typename T>
   struct X {
     static int value;
@@ -139,7 +139,7 @@ namespace NonLocalLambdaInstantation {
   }
 
   template<typename T>
-  struct X2 { // expected-note{{in instantiation of default member initializer 'NonLocalLambdaInstantation::X2<int *>::x'}}
+  struct X2 { // expected-note{{in instantiation of default member initializer 'NonLocalLambdaInstantiation::X2<int *>::x'}}
     int x = []{ return T(); }(); // expected-error{{cannot initialize a member subobject of type 'int' with an rvalue of type 'int *'}}
   };
 

diff --git a/clang/test/Modules/Inputs/cxx-irgen-top.h b/clang/test/Modules/Inputs/cxx-irgen-top.h
index f1a0bee..262a0fa 100644 (file)
--- a/clang/test/Modules/Inputs/cxx-irgen-top.h
+++ b/clang/test/Modules/Inputs/cxx-irgen-top.h
@@ -36,7 +36,7 @@ namespace ImplicitSpecialMembers {
 namespace OperatorDeleteLookup {
   struct A { void operator delete(void*); virtual ~A() = default; };
   template<typename T> struct B { void operator delete(void*); virtual ~B() {} typedef int t; };
-  typedef B<int>::t b_int_instantated;
+  typedef B<int>::t b_int_instantiated;
 }
 
 namespace EmitInlineMethods {

diff --git a/clang/test/SemaCXX/cxx1y-generic-lambdas-capturing.cpp b/clang/test/SemaCXX/cxx1y-generic-lambdas-capturing.cpp
index 8a0c960..2f00ad2 100644 (file)
--- a/clang/test/SemaCXX/cxx1y-generic-lambdas-capturing.cpp
+++ b/clang/test/SemaCXX/cxx1y-generic-lambdas-capturing.cpp
@@ -675,7 +675,7 @@ int foo()
         f(x, c);
         f(y, c);
         int i = x;
-        // This use will always be an error regardless of instantatiation
+        // This use will always be an error regardless of instantiation
         // so diagnose this early.
         const int &r = x; //expected-error{{variable}}
       };

diff --git a/clang/unittests/Tooling/Syntax/BuildTreeTest.cpp b/clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
index 6066aba..17e1bbe 100644 (file)
--- a/clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
+++ b/clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
@@ -3702,7 +3702,7 @@ TemplateDeclaration Declaration
 )txt"}));
 }
 
-TEST_P(BuildSyntaxTreeTest, ExplicitClassTemplateInstantation_Definition) {
+TEST_P(BuildSyntaxTreeTest, ExplicitClassTemplateInstantiation_Definition) {
   if (!GetParam().isCXX()) {
     return;
   }
@@ -3724,7 +3724,7 @@ ExplicitTemplateInstantiation
 )txt"}));
 }
 
-TEST_P(BuildSyntaxTreeTest, ExplicitClassTemplateInstantation_Declaration) {
+TEST_P(BuildSyntaxTreeTest, ExplicitClassTemplateInstantiation_Declaration) {
   if (!GetParam().isCXX()) {
     return;
   }

diff --git a/libcxx/include/memory b/libcxx/include/memory
index 9cdac6a..402a735 100644 (file)
--- a/libcxx/include/memory
+++ b/libcxx/include/memory
@@ -2028,7 +2028,7 @@ class __compressed_pair : private __compressed_pair_elem<_T1, 0>,
   // (The exception is std::function where it is possible that the function
   //  object and the allocator have the same type).
   static_assert((!is_same<_T1, _T2>::value),
-    "__compressed_pair cannot be instantated when T1 and T2 are the same type; "
+    "__compressed_pair cannot be instantiated when T1 and T2 are the same type; "
     "The current implementation is NOT ABI-compatible with the previous "
     "implementation for this configuration");
 

diff --git a/llvm/include/llvm/ADT/simple_ilist.h b/llvm/include/llvm/ADT/simple_ilist.h
index 9257b47..d5ae20c 100644 (file)
--- a/llvm/include/llvm/ADT/simple_ilist.h
+++ b/llvm/include/llvm/ADT/simple_ilist.h
@@ -52,7 +52,7 @@ namespace llvm {
 /// to calling \a std::for_each() on the range to be discarded.
 ///
 /// The currently available \p Options customize the nodes in the list.  The
-/// same options must be specified in the \a ilist_node instantation for
+/// same options must be specified in the \a ilist_node instantiation for
 /// compatibility (although the order is irrelevant).
 /// \li Use \a ilist_tag to designate which ilist_node for a given \p T this
 /// list should use.  This is useful if a type \p T is part of multiple,

diff --git a/llvm/lib/Support/SmallVector.cpp b/llvm/lib/Support/SmallVector.cpp
index debde5c..7e3d01f 100644 (file)
--- a/llvm/lib/Support/SmallVector.cpp
+++ b/llvm/lib/Support/SmallVector.cpp
@@ -108,7 +108,7 @@ void SmallVectorBase<Size_T>::grow_pod(void *FirstEl, size_t MinSize,
 template class llvm::SmallVectorBase<uint32_t>;
 
 // Disable the uint64_t instantiation for 32-bit builds.
-// Both uint32_t and uint64_t instantations are needed for 64-bit builds.
+// Both uint32_t and uint64_t instantiations are needed for 64-bit builds.
 // This instantiation will never be used in 32-bit builds, and will cause
 // warnings when sizeof(Size_T) > sizeof(size_t).
 #if SIZE_MAX > UINT32_MAX

diff --git a/llvm/test/tools/llvm-cov/cov-comdat.test b/llvm/test/tools/llvm-cov/cov-comdat.test
index 5184a95..d0cb39d 100644 (file)
--- a/llvm/test/tools/llvm-cov/cov-comdat.test
+++ b/llvm/test/tools/llvm-cov/cov-comdat.test
@@ -1,5 +1,5 @@
 # The binary contains two (merged) covmap sections which
-# have duplicate CovMapRecords from comdat (template instantation).
+# have duplicate CovMapRecords from comdat (template instantiation).
 # This test makes sure the reader reads it properly. It also
 # tests that the coverage data from different instantiations
 # of the same template function are properly merged in show