Author: eugenezelenko Date: Tue Jan 26 13:01:06 2016 New Revision: 258836 URL: http://llvm.org/viewvc/llvm-project?rev=258836&view=rev Log: Fix Clang-tidy modernize-use-nullptr warnings; other minor fixes.
Differential revision: http://reviews.llvm.org/D16567 Modified: cfe/trunk/include/clang/ASTMatchers/ASTMatchersInternal.h cfe/trunk/include/clang/Sema/DeclSpec.h cfe/trunk/lib/ASTMatchers/Dynamic/Marshallers.h cfe/trunk/lib/CodeGen/CGOpenMPRuntime.cpp cfe/trunk/lib/Sema/SemaType.cpp cfe/trunk/lib/StaticAnalyzer/Checkers/VforkChecker.cpp cfe/trunk/lib/StaticAnalyzer/Core/CheckerHelpers.cpp cfe/trunk/unittests/Basic/VirtualFileSystemTest.cpp Modified: cfe/trunk/include/clang/ASTMatchers/ASTMatchersInternal.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/ASTMatchers/ASTMatchersInternal.h?rev=258836&r1=258835&r2=258836&view=diff ============================================================================== --- cfe/trunk/include/clang/ASTMatchers/ASTMatchersInternal.h (original) +++ cfe/trunk/include/clang/ASTMatchers/ASTMatchersInternal.h Tue Jan 26 13:01:06 2016 @@ -420,7 +420,7 @@ public: template <typename From> Matcher(const Matcher<From> &Other, typename std::enable_if<std::is_base_of<From, T>::value && - !std::is_same<From, T>::value>::type * = 0) + !std::is_same<From, T>::value>::type * = nullptr) : Implementation(restrictMatcher(Other.Implementation)) { assert(Implementation.getSupportedKind().isSame( ast_type_traits::ASTNodeKind::getFromNodeKind<T>())); @@ -433,7 +433,7 @@ public: Matcher(const Matcher<TypeT> &Other, typename std::enable_if< std::is_same<T, QualType>::value && - std::is_same<TypeT, Type>::value>::type* = 0) + std::is_same<TypeT, Type>::value>::type* = nullptr) : Implementation(new TypeToQualType<TypeT>(Other)) {} /// \brief Convert \c this into a \c Matcher<T> by applying dyn_cast<> to the @@ -1600,4 +1600,4 @@ inline const Stmt *GetBodyMatcher<Functi } // end namespace ast_matchers } // end namespace clang -#endif +#endif // LLVM_CLANG_ASTMATCHERS_ASTMATCHERSINTERNAL_H Modified: cfe/trunk/include/clang/Sema/DeclSpec.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Sema/DeclSpec.h?rev=258836&r1=258835&r2=258836&view=diff ============================================================================== --- cfe/trunk/include/clang/Sema/DeclSpec.h (original) +++ cfe/trunk/include/clang/Sema/DeclSpec.h Tue Jan 26 13:01:06 2016 @@ -1552,7 +1552,7 @@ struct DeclaratorChunk { I.Kind = Pipe; I.Loc = Loc; I.Cls.TypeQuals = TypeQuals; - I.Cls.AttrList = 0; + I.Cls.AttrList = nullptr; return I; } @@ -2341,4 +2341,4 @@ struct LambdaIntroducer { } // end namespace clang -#endif +#endif // LLVM_CLANG_SEMA_DECLSPEC_H Modified: cfe/trunk/lib/ASTMatchers/Dynamic/Marshallers.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/ASTMatchers/Dynamic/Marshallers.h?rev=258836&r1=258835&r2=258836&view=diff ============================================================================== --- cfe/trunk/lib/ASTMatchers/Dynamic/Marshallers.h (original) +++ cfe/trunk/lib/ASTMatchers/Dynamic/Marshallers.h Tue Jan 26 13:01:06 2016 @@ -1,4 +1,4 @@ -//===--- Marshallers.h - Generic matcher function marshallers -*- C++ -*-===// +//===--- Marshallers.h - Generic matcher function marshallers ---*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -32,7 +32,6 @@ namespace ast_matchers { namespace dynamic { namespace internal { - /// \brief Helper template class to just from argument type to the right is/get /// functions in VariantValue. /// Used to verify and extract the matcher arguments below. @@ -234,7 +233,7 @@ static VariantMatcher outvalueToVariantM template <typename T> static VariantMatcher outvalueToVariantMatcher(const T &PolyMatcher, typename T::ReturnTypes * = - NULL) { + nullptr) { std::vector<DynTypedMatcher> Matchers; mergePolyMatchers(PolyMatcher, Matchers, typename T::ReturnTypes()); VariantMatcher Out = VariantMatcher::PolymorphicMatcher(std::move(Matchers)); @@ -410,7 +409,6 @@ private: return VariantMatcher(); \ } - /// \brief 0-arg marshaller function. template <typename ReturnType> static VariantMatcher matcherMarshall0(void (*Func)(), StringRef MatcherName, @@ -708,9 +706,9 @@ makeMatcherAutoMarshall(ast_matchers::in MatcherName); } -} // namespace internal -} // namespace dynamic -} // namespace ast_matchers -} // namespace clang +} // namespace internal +} // namespace dynamic +} // namespace ast_matchers +} // namespace clang -#endif // LLVM_CLANG_AST_MATCHERS_DYNAMIC_MARSHALLERS_H +#endif // LLVM_CLANG_AST_MATCHERS_DYNAMIC_MARSHALLERS_H Modified: cfe/trunk/lib/CodeGen/CGOpenMPRuntime.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGOpenMPRuntime.cpp?rev=258836&r1=258835&r2=258836&view=diff ============================================================================== --- cfe/trunk/lib/CodeGen/CGOpenMPRuntime.cpp (original) +++ cfe/trunk/lib/CodeGen/CGOpenMPRuntime.cpp Tue Jan 26 13:01:06 2016 @@ -2103,11 +2103,11 @@ CGOpenMPRuntime::createOffloadingBinaryD CGM.getTypes().ConvertTypeForMem(getTgtOffloadEntryQTy()); llvm::GlobalVariable *HostEntriesBegin = new llvm::GlobalVariable( M, OffloadEntryTy, /*isConstant=*/true, - llvm::GlobalValue::ExternalLinkage, /*Initializer=*/0, + llvm::GlobalValue::ExternalLinkage, /*Initializer=*/nullptr, ".omp_offloading.entries_begin"); llvm::GlobalVariable *HostEntriesEnd = new llvm::GlobalVariable( M, OffloadEntryTy, /*isConstant=*/true, - llvm::GlobalValue::ExternalLinkage, /*Initializer=*/0, + llvm::GlobalValue::ExternalLinkage, /*Initializer=*/nullptr, ".omp_offloading.entries_end"); // Create all device images @@ -2119,10 +2119,11 @@ CGOpenMPRuntime::createOffloadingBinaryD StringRef T = Devices[i].getTriple(); auto *ImgBegin = new llvm::GlobalVariable( M, CGM.Int8Ty, /*isConstant=*/true, llvm::GlobalValue::ExternalLinkage, - /*Initializer=*/0, Twine(".omp_offloading.img_start.") + Twine(T)); + /*Initializer=*/nullptr, + Twine(".omp_offloading.img_start.") + Twine(T)); auto *ImgEnd = new llvm::GlobalVariable( M, CGM.Int8Ty, /*isConstant=*/true, llvm::GlobalValue::ExternalLinkage, - /*Initializer=*/0, Twine(".omp_offloading.img_end.") + Twine(T)); + /*Initializer=*/nullptr, Twine(".omp_offloading.img_end.") + Twine(T)); llvm::Constant *Dev = llvm::ConstantStruct::get(DeviceImageTy, ImgBegin, ImgEnd, Modified: cfe/trunk/lib/Sema/SemaType.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaType.cpp?rev=258836&r1=258835&r2=258836&view=diff ============================================================================== --- cfe/trunk/lib/Sema/SemaType.cpp (original) +++ cfe/trunk/lib/Sema/SemaType.cpp Tue Jan 26 13:01:06 2016 @@ -239,7 +239,7 @@ namespace { savedAttrs.back()->setNext(nullptr); } }; -} +} // end anonymous namespace static void spliceAttrIntoList(AttributeList &attr, AttributeList *&head) { attr.setNext(head); @@ -1821,7 +1821,7 @@ namespace { /// /// The values of this enum are used in diagnostics. enum QualifiedFunctionKind { QFK_BlockPointer, QFK_Pointer, QFK_Reference }; -} +} // end anonymous namespace /// Check whether the type T is a qualified function type, and if it is, /// diagnose that it cannot be contained within the given kind of declarator. @@ -1971,7 +1971,6 @@ static bool isArraySizeVLA(Sema &S, Expr S.LangOpts.GNUMode).isInvalid(); } - /// \brief Build an array type. /// /// \param T The type of each element in the array. @@ -3004,7 +3003,7 @@ namespace { BlockPointer, MemberPointer, }; -} +} // end anonymous namespace IdentifierInfo *Sema::getNullabilityKeyword(NullabilityKind nullability) { switch (nullability) { @@ -3064,7 +3063,7 @@ namespace { // NSError** NSErrorPointerPointer, }; -} +} // end anonymous namespace /// Classify the given declarator, whose type-specified is \c type, based on /// what kind of pointer it refers to. @@ -3192,7 +3191,6 @@ static PointerDeclaratorKind classifyPoi break; } while (true); - switch (numNormalPointers) { case 0: return PointerDeclaratorKind::NonPointer; @@ -3641,7 +3639,6 @@ static TypeSourceInfo *GetFullTypeForDec T = S.BuildPointerType(T, DeclType.Loc, Name); if (DeclType.Ptr.TypeQuals) T = S.BuildQualifiedType(T, DeclType.Loc, DeclType.Ptr.TypeQuals); - break; case DeclaratorChunk::Reference: { // Verify that we're not building a reference to pointer to function with @@ -4068,7 +4065,6 @@ static TypeSourceInfo *GetFullTypeForDec T = Context.getFunctionType(T, ParamTys, EPI); } - break; } case DeclaratorChunk::MemberPointer: { @@ -4725,7 +4721,7 @@ namespace { void VisitPipeTypeLoc(PipeTypeLoc TL) { TL.setKWLoc(DS.getTypeSpecTypeLoc()); - TypeSourceInfo *TInfo = 0; + TypeSourceInfo *TInfo = nullptr; Sema::GetTypeFromParser(DS.getRepAsType(), &TInfo); TL.getValueLoc().initializeFullCopy(TInfo->getTypeLoc()); } @@ -4859,7 +4855,7 @@ namespace { llvm_unreachable("unsupported TypeLoc kind in declarator!"); } }; -} +} // end anonymous namespace static void fillAtomicQualLoc(AtomicTypeLoc ATL, const DeclaratorChunk &Chunk) { SourceLocation Loc; @@ -4995,7 +4991,6 @@ ParsedType Sema::ActOnObjCInstanceType(S return CreateParsedType(T, TInfo); } - //===----------------------------------------------------------------------===// // Type Attribute Processing //===----------------------------------------------------------------------===// @@ -5483,7 +5478,7 @@ namespace { llvm_unreachable("unknown wrapping kind"); } }; -} +} // end anonymous namespace static bool handleMSPointerTypeQualifierAttr(TypeProcessingState &State, AttributeList &Attr, Modified: cfe/trunk/lib/StaticAnalyzer/Checkers/VforkChecker.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Checkers/VforkChecker.cpp?rev=258836&r1=258835&r2=258836&view=diff ============================================================================== --- cfe/trunk/lib/StaticAnalyzer/Checkers/VforkChecker.cpp (original) +++ cfe/trunk/lib/StaticAnalyzer/Checkers/VforkChecker.cpp Tue Jan 26 13:01:06 2016 @@ -54,10 +54,10 @@ class VforkChecker : public Checker<chec bool isCallWhitelisted(const IdentifierInfo *II, CheckerContext &C) const; void reportBug(const char *What, CheckerContext &C, - const char *Details = 0) const; + const char *Details = nullptr) const; public: - VforkChecker() : II_vfork(0) {} + VforkChecker() : II_vfork(nullptr) {} void checkPreCall(const CallEvent &Call, CheckerContext &C) const; void checkPostCall(const CallEvent &Call, CheckerContext &C) const; @@ -107,7 +107,7 @@ bool VforkChecker::isCallWhitelisted(con "execv", "execvp", "execvpe", - 0, + nullptr }; ASTContext &AC = C.getASTContext(); Modified: cfe/trunk/lib/StaticAnalyzer/Core/CheckerHelpers.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Core/CheckerHelpers.cpp?rev=258836&r1=258835&r2=258836&view=diff ============================================================================== --- cfe/trunk/lib/StaticAnalyzer/Core/CheckerHelpers.cpp (original) +++ cfe/trunk/lib/StaticAnalyzer/Core/CheckerHelpers.cpp Tue Jan 26 13:01:06 2016 @@ -75,8 +75,8 @@ bool clang::ento::containsBuiltinOffsetO // Extract lhs and rhs from assignment statement std::pair<const clang::VarDecl *, const clang::Expr *> clang::ento::parseAssignment(const Stmt *S) { - const VarDecl *VD = 0; - const Expr *RHS = 0; + const VarDecl *VD = nullptr; + const Expr *RHS = nullptr; if (auto Assign = dyn_cast_or_null<BinaryOperator>(S)) { if (Assign->isAssignmentOp()) { Modified: cfe/trunk/unittests/Basic/VirtualFileSystemTest.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Basic/VirtualFileSystemTest.cpp?rev=258836&r1=258835&r2=258836&view=diff ============================================================================== --- cfe/trunk/unittests/Basic/VirtualFileSystemTest.cpp (original) +++ cfe/trunk/unittests/Basic/VirtualFileSystemTest.cpp Tue Jan 26 13:01:06 2016 @@ -29,7 +29,7 @@ struct DummyFile : public vfs::File { bool IsVolatile) override { llvm_unreachable("unimplemented"); } - virtual std::error_code close() override { return std::error_code(); } + std::error_code close() override { return std::error_code(); } }; class DummyFileSystem : public vfs::FileSystem { @@ -348,7 +348,6 @@ TEST(VirtualFileSystemTest, BasicRealFSR ASSERT_FALSE(EC); ASSERT_NE(vfs::recursive_directory_iterator(), I); - std::vector<std::string> Contents; for (auto E = vfs::recursive_directory_iterator(); !EC && I != E; I.increment(EC)) { _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits