diff options
| -rw-r--r-- | lib/Frontend/TextDiagnostic.cpp | 7 | ||||
| -rw-r--r-- | lib/Sema/SemaObjCProperty.cpp | 2 |
2 files changed, 0 insertions, 9 deletions
diff --git a/lib/Frontend/TextDiagnostic.cpp b/lib/Frontend/TextDiagnostic.cpp index 7c2b03748c..302621a901 100644 --- a/lib/Frontend/TextDiagnostic.cpp +++ b/lib/Frontend/TextDiagnostic.cpp @@ -904,8 +904,6 @@ void TextDiagnostic::emitSnippetAndCaret( unsigned LineNo = SM.getLineNumber(FID, FileOffset); unsigned ColNo = SM.getColumnNumber(FID, FileOffset); - unsigned CaretEndColNo - = ColNo + Lexer::MeasureTokenLength(Loc, SM, LangOpts); // Rewind from the current position to the start of the line. const char *TokPtr = BufStart+FileOffset; @@ -918,11 +916,6 @@ void TextDiagnostic::emitSnippetAndCaret( while (*LineEnd != '\n' && *LineEnd != '\r' && *LineEnd != '\0') ++LineEnd; - // FIXME: This shouldn't be necessary, but the CaretEndColNo can extend past - // the source line length as currently being computed. See - // test/Misc/message-length.c. - CaretEndColNo = std::min(CaretEndColNo, unsigned(LineEnd - LineStart)); - // Copy the line of code into an std::string for ease of manipulation. std::string SourceLine(LineStart, LineEnd); diff --git a/lib/Sema/SemaObjCProperty.cpp b/lib/Sema/SemaObjCProperty.cpp index 335dad18dd..27deab226f 100644 --- a/lib/Sema/SemaObjCProperty.cpp +++ b/lib/Sema/SemaObjCProperty.cpp @@ -730,8 +730,6 @@ Decl *Sema::ActOnPropertyImplDecl(Scope *S, (PIkind & ObjCPropertyDecl::OBJC_PR_readonly) && property->hasAttr<IBOutletAttr>() && !AtLoc.isValid()) { - unsigned rwPIKind = (PIkind | ObjCPropertyDecl::OBJC_PR_readwrite); - rwPIKind &= (~ObjCPropertyDecl::OBJC_PR_readonly); Diag(IC->getLocation(), diag::warn_auto_readonly_iboutlet_property); Diag(property->getLocation(), diag::note_property_declare); SourceLocation readonlyLoc; |