From: Richard Trieu Date: Sat, 6 Aug 2016 01:44:06 +0000 (+0000) Subject: Fix typos from r277797 and unused variable from r277889. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cbe2a72db844ceb4ea9f49590ab8bc552b6e0337;p=clang Fix typos from r277797 and unused variable from r277889. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@277900 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/AST/ASTDiagnostic.cpp b/lib/AST/ASTDiagnostic.cpp index 85ab4cc3e6..590defb7ee 100644 --- a/lib/AST/ASTDiagnostic.cpp +++ b/lib/AST/ASTDiagnostic.cpp @@ -938,13 +938,13 @@ class TemplateDiff { /// isEnd - Returns true if the iterator is one past the end. bool isEnd() const { - assert(TST && "InternalalIterator is invalid with a null TST."); + assert(TST && "InternalIterator is invalid with a null TST."); return Index >= TST->getNumArgs(); } /// &operator++ - Increment the iterator to the next template argument. InternalIterator &operator++() { - assert(TST && "InternalalIterator is invalid with a null TST."); + assert(TST && "InternalIterator is invalid with a null TST."); if (isEnd()) { return *this; } @@ -980,7 +980,7 @@ class TemplateDiff { /// operator* - Returns the appropriate TemplateArgument. reference operator*() const { - assert(TST && "InternalalIterator is invalid with a null TST."); + assert(TST && "InternalIterator is invalid with a null TST."); assert(!isEnd() && "Index exceeds number of arguments."); if (CurrentTA == EndTA) return TST->getArg(Index); @@ -990,7 +990,7 @@ class TemplateDiff { /// operator-> - Allow access to the underlying TemplateArgument. pointer operator->() const { - assert(TST && "InternalalIterator is invalid with a null TST."); + assert(TST && "InternalIterator is invalid with a null TST."); return &operator*(); } }; diff --git a/test/SemaCXX/return-stack-addr-2.cpp b/test/SemaCXX/return-stack-addr-2.cpp index f6ea9b2a73..47b45957e9 100644 --- a/test/SemaCXX/return-stack-addr-2.cpp +++ b/test/SemaCXX/return-stack-addr-2.cpp @@ -65,20 +65,17 @@ const int *int6() { const int *int7(int x) { const int &x2 = x; // expected-note{{binding reference variable 'x2' here}} - const int &x3 = x2; return &x2; // expected-warning{{address of stack memory associated with local variable 'x' returned}} } const int *int8(const int &x = 5) { const int &x2 = x; - const int &x3 = x2; return &x2; } const int *int9() { const int &x = 5; // expected-note{{binding reference variable 'x' here}} const int &x2 = x; // expected-note{{binding reference variable 'x2' here}} - const int &x3 = x2; return &x2; // expected-warning{{returning address of local temporary object}} } }