From: Casey Carter Date: Tue, 28 Apr 2020 21:50:52 +0000 (-0700) Subject: [NFC] Correct spelling of "ambiguous" X-Git-Tag: llvmorg-12-init~7538 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=68b30bc02b3a7e84d03f43a82cc08e5df76a28dd;p=platform%2Fupstream%2Fllvm.git [NFC] Correct spelling of "ambiguous" --- diff --git a/clang/include/clang/Sema/Sema.h b/clang/include/clang/Sema/Sema.h index 8a0dd4a..c3c5533 100644 --- a/clang/include/clang/Sema/Sema.h +++ b/clang/include/clang/Sema/Sema.h @@ -6862,7 +6862,7 @@ public: bool IgnoreAccess = false); bool CheckDerivedToBaseConversion(QualType Derived, QualType Base, unsigned InaccessibleBaseID, - unsigned AmbigiousBaseConvID, + unsigned AmbiguousBaseConvID, SourceLocation Loc, SourceRange Range, DeclarationName Name, CXXCastPath *BasePath, diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp index e827fe3..78d9322 100644 --- a/clang/lib/Sema/SemaDeclCXX.cpp +++ b/clang/lib/Sema/SemaDeclCXX.cpp @@ -2821,13 +2821,13 @@ void Sema::BuildBasePathArray(const CXXBasePaths &Paths, /// if there is an error, and Range is the source range to highlight /// if there is an error. /// -/// If either InaccessibleBaseID or AmbigiousBaseConvID are 0, then the +/// If either InaccessibleBaseID or AmbiguousBaseConvID are 0, then the /// diagnostic for the respective type of error will be suppressed, but the /// check for ill-formed code will still be performed. bool Sema::CheckDerivedToBaseConversion(QualType Derived, QualType Base, unsigned InaccessibleBaseID, - unsigned AmbigiousBaseConvID, + unsigned AmbiguousBaseConvID, SourceLocation Loc, SourceRange Range, DeclarationName Name, CXXCastPath *BasePath, @@ -2853,7 +2853,7 @@ Sema::CheckDerivedToBaseConversion(QualType Derived, QualType Base, for (const CXXBasePath &PossiblePath : Paths) { if (PossiblePath.size() == 1) { Path = &PossiblePath; - if (AmbigiousBaseConvID) + if (AmbiguousBaseConvID) Diag(Loc, diag::ext_ms_ambiguous_direct_base) << Base << Derived << Range; break; @@ -2881,7 +2881,7 @@ Sema::CheckDerivedToBaseConversion(QualType Derived, QualType Base, return false; } - if (AmbigiousBaseConvID) { + if (AmbiguousBaseConvID) { // We know that the derived-to-base conversion is ambiguous, and // we're going to produce a diagnostic. Perform the derived-to-base // search just one more time to compute all of the possible paths so @@ -2900,7 +2900,7 @@ Sema::CheckDerivedToBaseConversion(QualType Derived, QualType Base, // to each base class subobject. std::string PathDisplayStr = getAmbiguousPathsDisplayString(Paths); - Diag(Loc, AmbigiousBaseConvID) + Diag(Loc, AmbiguousBaseConvID) << Derived << Base << PathDisplayStr << Range << Name; } return true; diff --git a/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp index 1db854e..fb5eff0 100644 --- a/clang/lib/Sema/SemaOverload.cpp +++ b/clang/lib/Sema/SemaOverload.cpp @@ -3003,13 +3003,13 @@ bool Sema::CheckPointerConversion(Expr *From, QualType ToType, // We must have a derived-to-base conversion. Check an // ambiguous or inaccessible conversion. unsigned InaccessibleID = 0; - unsigned AmbigiousID = 0; + unsigned AmbiguousID = 0; if (Diagnose) { InaccessibleID = diag::err_upcast_to_inaccessible_base; - AmbigiousID = diag::err_ambiguous_derived_to_base_conv; + AmbiguousID = diag::err_ambiguous_derived_to_base_conv; } if (CheckDerivedToBaseConversion( - FromPointeeType, ToPointeeType, InaccessibleID, AmbigiousID, + FromPointeeType, ToPointeeType, InaccessibleID, AmbiguousID, From->getExprLoc(), From->getSourceRange(), DeclarationName(), &BasePath, IgnoreBaseAccess)) return true; diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/const_optional_U.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/const_optional_U.pass.cpp index cf44921..b75dbfe 100644 --- a/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/const_optional_U.pass.cpp +++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/const_optional_U.pass.cpp @@ -143,7 +143,7 @@ void test_with_test_type() { assert(T::alive == 0); } -void test_ambigious_assign() { +void test_ambiguous_assign() { using OptInt = std::optional; { using T = AssignableFrom; @@ -199,7 +199,7 @@ void test_ambigious_assign() { int main(int, char**) { test_with_test_type(); - test_ambigious_assign(); + test_ambiguous_assign(); { optional opt; constexpr optional opt2; diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/optional_U.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/optional_U.pass.cpp index 2239aca..d8bae28 100644 --- a/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/optional_U.pass.cpp +++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/optional_U.pass.cpp @@ -148,7 +148,7 @@ void test_with_test_type() { } -void test_ambigious_assign() { +void test_ambiguous_assign() { using OptInt = std::optional; { using T = AssignableFrom; @@ -204,7 +204,7 @@ void test_ambigious_assign() { int main(int, char**) { test_with_test_type(); - test_ambigious_assign(); + test_ambiguous_assign(); { optional opt; optional opt2; diff --git a/llvm/lib/CodeGen/ReachingDefAnalysis.cpp b/llvm/lib/CodeGen/ReachingDefAnalysis.cpp index 9785c04..ea667f1 100644 --- a/llvm/lib/CodeGen/ReachingDefAnalysis.cpp +++ b/llvm/lib/CodeGen/ReachingDefAnalysis.cpp @@ -538,7 +538,7 @@ bool ReachingDefAnalysis::isSafeToMove(MachineInstr *From, // Now walk checking that the rest of the instructions will compute the same // value and that we're not overwriting anything. Don't move the instruction - // past any memory, control-flow or other ambigious instructions. + // past any memory, control-flow or other ambiguous instructions. for (auto I = ++Iterator(From), E = Iterator(To); I != E; ++I) { if (mayHaveSideEffects(*I)) return false;