From c4f5a5e8637543f16d4b3b191b1aba32c650f1f3 Mon Sep 17 00:00:00 2001 From: Justin Bogner Date: Fri, 20 Feb 2015 07:28:28 +0000 Subject: Disallow implicit conversions from None to integer types This fixes an error introduced in r228934 where None was converted to an int instead of the int being converted to an Optional as intended. We make that sort of mistake a compile error by changing NoneType into a scoped enum. Finally, provide a static NoneType called None to avoid forcing all users to spell it NoneType::None. llvm-svn: 229980 --- llvm/lib/ProfileData/CoverageMapping.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'llvm/lib') diff --git a/llvm/lib/ProfileData/CoverageMapping.cpp b/llvm/lib/ProfileData/CoverageMapping.cpp index a124d792e87..da619e1bf9f 100644 --- a/llvm/lib/ProfileData/CoverageMapping.cpp +++ b/llvm/lib/ProfileData/CoverageMapping.cpp @@ -361,7 +361,9 @@ static Optional findMainViewFileID(StringRef SourceFile, IsNotExpandedFile[CR.ExpandedFileID] = false; IsNotExpandedFile &= FilenameEquivalence; int I = IsNotExpandedFile.find_first(); - return I != -1 ? I : None; + if (I == -1) + return None; + return I; } static Optional findMainViewFileID(const FunctionRecord &Function) { @@ -370,7 +372,9 @@ static Optional findMainViewFileID(const FunctionRecord &Function) { if (CR.Kind == CounterMappingRegion::ExpansionRegion) IsNotExpandedFile[CR.ExpandedFileID] = false; int I = IsNotExpandedFile.find_first(); - return I != -1 ? I : None; + if (I == -1) + return None; + return I; } /// Sort a nested sequence of regions from a single file. -- cgit v1.2.3