Author: yrnkrn Date: Sat Oct 3 05:46:20 2015 New Revision: 249235 URL: http://llvm.org/viewvc/llvm-project?rev=249235&view=rev Log: Replace double negation of !FileID.isInvalid() with FileID.isValid(). +couple more of double-negated !SourceLocation.isInvalid() unfixed in r249228.
Modified: cfe/trunk/include/clang/Basic/SourceLocation.h cfe/trunk/lib/ARCMigrate/ObjCMT.cpp cfe/trunk/lib/Basic/SourceManager.cpp cfe/trunk/lib/CodeGen/CoverageMappingGen.cpp cfe/trunk/lib/Edit/EditedSource.cpp cfe/trunk/lib/Frontend/CompilerInstance.cpp cfe/trunk/lib/Frontend/LogDiagnosticPrinter.cpp cfe/trunk/lib/Frontend/TextDiagnostic.cpp cfe/trunk/lib/Index/CommentToXML.cpp cfe/trunk/lib/Lex/PPDirectives.cpp cfe/trunk/lib/Lex/PreprocessingRecord.cpp cfe/trunk/lib/Lex/Preprocessor.cpp cfe/trunk/lib/Sema/SemaExceptionSpec.cpp cfe/trunk/lib/Sema/SemaObjCProperty.cpp cfe/trunk/lib/Sema/SemaType.cpp cfe/trunk/lib/Serialization/ASTReader.cpp cfe/trunk/lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp cfe/trunk/tools/libclang/CIndex.cpp Modified: cfe/trunk/include/clang/Basic/SourceLocation.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/SourceLocation.h?rev=249235&r1=249234&r2=249235&view=diff ============================================================================== --- cfe/trunk/include/clang/Basic/SourceLocation.h (original) +++ cfe/trunk/include/clang/Basic/SourceLocation.h Sat Oct 3 05:46:20 2015 @@ -43,6 +43,7 @@ class FileID { public: FileID() : ID(0) {} + bool isValid() const { return ID != 0; } bool isInvalid() const { return ID == 0; } bool operator==(const FileID &RHS) const { return ID == RHS.ID; } Modified: cfe/trunk/lib/ARCMigrate/ObjCMT.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/ARCMigrate/ObjCMT.cpp?rev=249235&r1=249234&r2=249235&view=diff ============================================================================== --- cfe/trunk/lib/ARCMigrate/ObjCMT.cpp (original) +++ cfe/trunk/lib/ARCMigrate/ObjCMT.cpp Sat Oct 3 05:46:20 2015 @@ -1805,7 +1805,7 @@ private: FileID FID; unsigned Offset; std::tie(FID, Offset) = SourceMgr.getDecomposedLoc(Loc); - assert(!FID.isInvalid()); + assert(FID.isValid()); SmallString<200> Path = StringRef(SourceMgr.getFileEntryForID(FID)->getName()); llvm::sys::fs::make_absolute(Path); @@ -1862,8 +1862,8 @@ void ObjCMigrateASTConsumer::HandleTrans for (DeclContext::decl_iterator D = TU->decls_begin(), DEnd = TU->decls_end(); D != DEnd; ++D) { FileID FID = PP.getSourceManager().getFileID((*D)->getLocation()); - if (!FID.isInvalid()) - if (!FileId.isInvalid() && FileId != FID) { + if (FID.isValid()) + if (FileId.isValid() && FileId != FID) { if (ASTMigrateActions & FrontendOptions::ObjCMT_Annotation) AnnotateImplicitBridging(Ctx); } Modified: cfe/trunk/lib/Basic/SourceManager.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/SourceManager.cpp?rev=249235&r1=249234&r2=249235&view=diff ============================================================================== --- cfe/trunk/lib/Basic/SourceManager.cpp (original) +++ cfe/trunk/lib/Basic/SourceManager.cpp Sat Oct 3 05:46:20 2015 @@ -1408,7 +1408,7 @@ unsigned SourceManager::getPresumedLineN /// considered to be from a system header. SrcMgr::CharacteristicKind SourceManager::getFileCharacteristic(SourceLocation Loc) const { - assert(!Loc.isInvalid() && "Can't get file characteristic of invalid loc!"); + assert(Loc.isValid() && "Can't get file characteristic of invalid loc!"); std::pair<FileID, unsigned> LocInfo = getDecomposedExpansionLoc(Loc); bool Invalid = false; const SLocEntry &SEntry = getSLocEntry(LocInfo.first, &Invalid); @@ -1613,7 +1613,7 @@ FileID SourceManager::translateFile(cons // location in the main file. Optional<llvm::sys::fs::UniqueID> SourceFileUID; Optional<StringRef> SourceFileName; - if (!MainFileID.isInvalid()) { + if (MainFileID.isValid()) { bool Invalid = false; const SLocEntry &MainSLoc = getSLocEntry(MainFileID, &Invalid); if (Invalid) @@ -1786,7 +1786,7 @@ SourceLocation SourceManager::translateL /// 110 -> SourceLocation() void SourceManager::computeMacroArgsCache(MacroArgsMap *&CachePtr, FileID FID) const { - assert(!FID.isInvalid()); + assert(FID.isValid()); assert(!CachePtr); CachePtr = new MacroArgsMap(); Modified: cfe/trunk/lib/CodeGen/CoverageMappingGen.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CoverageMappingGen.cpp?rev=249235&r1=249234&r2=249235&view=diff ============================================================================== --- cfe/trunk/lib/CodeGen/CoverageMappingGen.cpp (original) +++ cfe/trunk/lib/CodeGen/CoverageMappingGen.cpp Sat Oct 3 05:46:20 2015 @@ -244,7 +244,7 @@ public: assert(Region.hasEndLoc() && "incomplete region"); SourceLocation LocStart = Region.getStartLoc(); - assert(!SM.getFileID(LocStart).isInvalid() && "region in invalid file"); + assert(SM.getFileID(LocStart).isValid() && "region in invalid file"); auto CovFileID = getCoverageFileID(LocStart); // Ignore regions that don't have a file, such as builtin macros. Modified: cfe/trunk/lib/Edit/EditedSource.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Edit/EditedSource.cpp?rev=249235&r1=249234&r2=249235&view=diff ============================================================================== --- cfe/trunk/lib/Edit/EditedSource.cpp (original) +++ cfe/trunk/lib/Edit/EditedSource.cpp Sat Oct 3 05:46:20 2015 @@ -364,7 +364,7 @@ static void adjustRemoval(const SourceMa static void applyRewrite(EditsReceiver &receiver, StringRef text, FileOffset offs, unsigned len, const SourceManager &SM, const LangOptions &LangOpts) { - assert(!offs.getFID().isInvalid()); + assert(offs.getFID().isValid()); SourceLocation Loc = SM.getLocForStartOfFile(offs.getFID()); Loc = Loc.getLocWithOffset(offs.getOffset()); assert(Loc.isFileID()); Modified: cfe/trunk/lib/Frontend/CompilerInstance.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/CompilerInstance.cpp?rev=249235&r1=249234&r2=249235&view=diff ============================================================================== --- cfe/trunk/lib/Frontend/CompilerInstance.cpp (original) +++ cfe/trunk/lib/Frontend/CompilerInstance.cpp Sat Oct 3 05:46:20 2015 @@ -726,7 +726,7 @@ bool CompilerInstance::InitializeSourceM if (Input.isBuffer()) { SourceMgr.setMainFileID(SourceMgr.createFileID( std::unique_ptr<llvm::MemoryBuffer>(Input.getBuffer()), Kind)); - assert(!SourceMgr.getMainFileID().isInvalid() && + assert(SourceMgr.getMainFileID().isValid() && "Couldn't establish MainFileID!"); return true; } @@ -777,7 +777,7 @@ bool CompilerInstance::InitializeSourceM SourceMgr.overrideFileContents(File, std::move(SB)); } - assert(!SourceMgr.getMainFileID().isInvalid() && + assert(SourceMgr.getMainFileID().isValid() && "Couldn't establish MainFileID!"); return true; } @@ -1358,7 +1358,7 @@ CompilerInstance::loadModule(SourceLocat // If we've already handled this import, just return the cached result. // This one-element cache is important to eliminate redundant diagnostics // when both the preprocessor and parser see the same import declaration. - if (!ImportLoc.isInvalid() && LastModuleImportLoc == ImportLoc) { + if (ImportLoc.isValid() && LastModuleImportLoc == ImportLoc) { // Make the named module visible. if (LastModuleImportResult && ModuleName != getLangOpts().CurrentModule && ModuleName != getLangOpts().ImplementationOfModule) Modified: cfe/trunk/lib/Frontend/LogDiagnosticPrinter.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/LogDiagnosticPrinter.cpp?rev=249235&r1=249234&r2=249235&view=diff ============================================================================== --- cfe/trunk/lib/Frontend/LogDiagnosticPrinter.cpp (original) +++ cfe/trunk/lib/Frontend/LogDiagnosticPrinter.cpp Sat Oct 3 05:46:20 2015 @@ -118,7 +118,7 @@ void LogDiagnosticPrinter::HandleDiagnos if (MainFilename.empty() && Info.hasSourceManager()) { const SourceManager &SM = Info.getSourceManager(); FileID FID = SM.getMainFileID(); - if (!FID.isInvalid()) { + if (FID.isValid()) { const FileEntry *FE = SM.getFileEntryForID(FID); if (FE && FE->isValid()) MainFilename = FE->getName(); @@ -147,7 +147,7 @@ void LogDiagnosticPrinter::HandleDiagnos if (PLoc.isInvalid()) { // At least print the file name if available: FileID FID = SM.getFileID(Info.getLocation()); - if (!FID.isInvalid()) { + if (FID.isValid()) { const FileEntry *FE = SM.getFileEntryForID(FID); if (FE && FE->isValid()) DE.Filename = FE->getName(); Modified: cfe/trunk/lib/Frontend/TextDiagnostic.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/TextDiagnostic.cpp?rev=249235&r1=249234&r2=249235&view=diff ============================================================================== --- cfe/trunk/lib/Frontend/TextDiagnostic.cpp (original) +++ cfe/trunk/lib/Frontend/TextDiagnostic.cpp Sat Oct 3 05:46:20 2015 @@ -777,7 +777,7 @@ void TextDiagnostic::emitDiagnosticLoc(S if (PLoc.isInvalid()) { // At least print the file name if available: FileID FID = SM.getFileID(Loc); - if (!FID.isInvalid()) { + if (FID.isValid()) { const FileEntry* FE = SM.getFileEntryForID(FID); if (FE && FE->isValid()) { OS << FE->getName(); Modified: cfe/trunk/lib/Index/CommentToXML.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Index/CommentToXML.cpp?rev=249235&r1=249234&r2=249235&view=diff ============================================================================== --- cfe/trunk/lib/Index/CommentToXML.cpp (original) +++ cfe/trunk/lib/Index/CommentToXML.cpp Sat Oct 3 05:46:20 2015 @@ -894,7 +894,7 @@ void CommentASTToXMLConverter::visitFull FileID FID = LocInfo.first; unsigned FileOffset = LocInfo.second; - if (!FID.isInvalid()) { + if (FID.isValid()) { if (const FileEntry *FE = SM.getFileEntryForID(FID)) { Result << " file=\""; appendToResultWithXMLEscaping(FE->getName()); Modified: cfe/trunk/lib/Lex/PPDirectives.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/PPDirectives.cpp?rev=249235&r1=249234&r2=249235&view=diff ============================================================================== --- cfe/trunk/lib/Lex/PPDirectives.cpp (original) +++ cfe/trunk/lib/Lex/PPDirectives.cpp Sat Oct 3 05:46:20 2015 @@ -1799,7 +1799,7 @@ void Preprocessor::HandleIncludeDirectiv if (IncludePos.isMacroID()) IncludePos = SourceMgr.getExpansionRange(IncludePos).second; FileID FID = SourceMgr.createFileID(File, IncludePos, FileCharacter); - assert(!FID.isInvalid() && "Expected valid file ID"); + assert(FID.isValid() && "Expected valid file ID"); // If all is good, enter the new file! if (EnterSourceFile(FID, CurDir, FilenameTok.getLocation())) Modified: cfe/trunk/lib/Lex/PreprocessingRecord.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/PreprocessingRecord.cpp?rev=249235&r1=249234&r2=249235&view=diff ============================================================================== --- cfe/trunk/lib/Lex/PreprocessingRecord.cpp (original) +++ cfe/trunk/lib/Lex/PreprocessingRecord.cpp Sat Oct 3 05:46:20 2015 @@ -66,7 +66,7 @@ PreprocessingRecord::getPreprocessedEnti static bool isPreprocessedEntityIfInFileID(PreprocessedEntity *PPE, FileID FID, SourceManager &SM) { - assert(!FID.isInvalid()); + assert(FID.isValid()); if (!PPE) return false; Modified: cfe/trunk/lib/Lex/Preprocessor.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/Preprocessor.cpp?rev=249235&r1=249234&r2=249235&view=diff ============================================================================== --- cfe/trunk/lib/Lex/Preprocessor.cpp (original) +++ cfe/trunk/lib/Lex/Preprocessor.cpp Sat Oct 3 05:46:20 2015 @@ -519,7 +519,7 @@ void Preprocessor::EnterMainSourceFile() llvm::MemoryBuffer::getMemBufferCopy(Predefines, "<built-in>"); assert(SB && "Cannot create predefined source buffer"); FileID FID = SourceMgr.createFileID(std::move(SB)); - assert(!FID.isInvalid() && "Could not create FileID for predefines?"); + assert(FID.isValid() && "Could not create FileID for predefines?"); setPredefinesFileID(FID); // Start parsing the predefines. Modified: cfe/trunk/lib/Sema/SemaExceptionSpec.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExceptionSpec.cpp?rev=249235&r1=249234&r2=249235&view=diff ============================================================================== --- cfe/trunk/lib/Sema/SemaExceptionSpec.cpp (original) +++ cfe/trunk/lib/Sema/SemaExceptionSpec.cpp Sat Oct 3 05:46:20 2015 @@ -232,7 +232,7 @@ bool Sema::CheckEquivalentExceptionSpec( hasImplicitExceptionSpec(Old) != hasImplicitExceptionSpec(New)) { Diag(New->getLocation(), diag::ext_implicit_exception_spec_mismatch) << hasImplicitExceptionSpec(Old); - if (!Old->getLocation().isInvalid()) + if (Old->getLocation().isValid()) Diag(Old->getLocation(), diag::note_previous_declaration); } return false; @@ -353,7 +353,7 @@ bool Sema::CheckEquivalentExceptionSpec( << FixItHint::CreateInsertion(FixItLoc, " " + OS.str().str()); } - if (!Old->getLocation().isInvalid()) + if (Old->getLocation().isValid()) Diag(Old->getLocation(), diag::note_previous_declaration); return ReturnValueOnError; Modified: cfe/trunk/lib/Sema/SemaObjCProperty.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaObjCProperty.cpp?rev=249235&r1=249234&r2=249235&view=diff ============================================================================== --- cfe/trunk/lib/Sema/SemaObjCProperty.cpp (original) +++ cfe/trunk/lib/Sema/SemaObjCProperty.cpp Sat Oct 3 05:46:20 2015 @@ -1563,7 +1563,7 @@ void Sema::DefaultSynthesizeProperties(S IMPDecl->FindPropertyImplIvarDecl(Prop->getIdentifier())) { Diag(Prop->getLocation(), diag::warn_no_autosynthesis_shared_ivar_property) << Prop->getIdentifier(); - if (!PID->getLocation().isInvalid()) + if (PID->getLocation().isValid()) Diag(PID->getLocation(), diag::note_property_synthesize); continue; } Modified: cfe/trunk/lib/Sema/SemaType.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaType.cpp?rev=249235&r1=249234&r2=249235&view=diff ============================================================================== --- cfe/trunk/lib/Sema/SemaType.cpp (original) +++ cfe/trunk/lib/Sema/SemaType.cpp Sat Oct 3 05:46:20 2015 @@ -2480,7 +2480,7 @@ void Sema::diagnoseIgnoredQualifiers(uns // If we have a location for the qualifier, offer a fixit. SourceLocation QualLoc = QualKinds[I].Loc; - if (!QualLoc.isInvalid()) { + if (QualLoc.isValid()) { FixIts[NumQuals] = FixItHint::CreateRemoval(QualLoc); if (Loc.isInvalid() || getSourceManager().isBeforeInTranslationUnit(QualLoc, Loc)) @@ -3318,7 +3318,7 @@ static TypeSourceInfo *GetFullTypeForDec // Determine which file we saw the assume-nonnull region in. FileID file = getNullabilityCompletenessCheckFileID( S, S.PP.getPragmaAssumeNonNullLoc()); - if (!file.isInvalid()) { + if (file.isValid()) { FileNullability &fileNullability = S.NullabilityMap[file]; // If we haven't seen any type nullability before, now we have. Modified: cfe/trunk/lib/Serialization/ASTReader.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTReader.cpp?rev=249235&r1=249234&r2=249235&view=diff ============================================================================== --- cfe/trunk/lib/Serialization/ASTReader.cpp (original) +++ cfe/trunk/lib/Serialization/ASTReader.cpp Sat Oct 3 05:46:20 2015 @@ -1340,7 +1340,7 @@ SourceLocation ASTReader::getImportLocat // location of its includer. if (F->ImportedBy.empty() || !F->ImportedBy[0]) { // Main file is the importer. - assert(!SourceMgr.getMainFileID().isInvalid() && "missing main file"); + assert(SourceMgr.getMainFileID().isValid() && "missing main file"); return SourceMgr.getLocForStartOfFile(SourceMgr.getMainFileID()); } return F->ImportedBy[0]->FirstLoc; @@ -3596,7 +3596,7 @@ ASTReader::ASTReadResult ASTReader::Read DeserializationListener->ReaderInitialized(this); ModuleFile &PrimaryModule = ModuleMgr.getPrimaryModule(); - if (!PrimaryModule.OriginalSourceFileID.isInvalid()) { + if (PrimaryModule.OriginalSourceFileID.isValid()) { PrimaryModule.OriginalSourceFileID = FileID::get(PrimaryModule.SLocEntryBaseID + PrimaryModule.OriginalSourceFileID.getOpaqueValue() - 1); Modified: cfe/trunk/lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp?rev=249235&r1=249234&r2=249235&view=diff ============================================================================== --- cfe/trunk/lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp (original) +++ cfe/trunk/lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp Sat Oct 3 05:46:20 2015 @@ -126,7 +126,7 @@ void HTMLDiagnostics::ReportDiag(const P assert(!path.empty()); FileID FID = (*path.begin())->getLocation().asLocation().getExpansionLoc().getFileID(); - assert(!FID.isInvalid()); + assert(FID.isValid()); // Create a new rewriter to generate HTML. Rewriter R(const_cast<SourceManager&>(SMgr), PP.getLangOpts()); Modified: cfe/trunk/tools/libclang/CIndex.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/CIndex.cpp?rev=249235&r1=249234&r2=249235&view=diff ============================================================================== --- cfe/trunk/tools/libclang/CIndex.cpp (original) +++ cfe/trunk/tools/libclang/CIndex.cpp Sat Oct 3 05:46:20 2015 @@ -147,7 +147,7 @@ CXSourceRange cxloc::translateSourceRang SourceLocation EndLoc = R.getEnd(); if (EndLoc.isValid() && EndLoc.isMacroID() && !SM.isMacroArgExpansion(EndLoc)) EndLoc = SM.getExpansionRange(EndLoc).second; - if (R.isTokenRange() && !EndLoc.isInvalid()) { + if (R.isTokenRange() && EndLoc.isValid()) { unsigned Length = Lexer::MeasureTokenLength(SM.getSpellingLoc(EndLoc), SM, LangOpts); EndLoc = EndLoc.getLocWithOffset(Length); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits