summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Pilgrim <llvm-dev@redking.me.uk>2017-06-01 18:13:02 +0000
committerSimon Pilgrim <llvm-dev@redking.me.uk>2017-06-01 18:13:02 +0000
commitf940987a4e21b104c58b60ca1ca904d354487d0d (patch)
tree205ee3d6091edaa33d7e8f62544039f8544f5056
parentb3b10c2fa5e48ee4f9d67df1e2d31c1eb6629a61 (diff)
downloadbcm5719-llvm-f940987a4e21b104c58b60ca1ca904d354487d0d.tar.gz
bcm5719-llvm-f940987a4e21b104c58b60ca1ca904d354487d0d.zip
Remove late nullptr pointer test (PR32447)
IgnoreNarrowingConversion should never return nullptr, but I've added an assert just in case. llvm-svn: 304444
-rw-r--r--clang/lib/Sema/SemaOverload.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp
index 1ba84034fa4..e0583d71640 100644
--- a/clang/lib/Sema/SemaOverload.cpp
+++ b/clang/lib/Sema/SemaOverload.cpp
@@ -330,13 +330,13 @@ StandardConversionSequence::getNarrowingKind(ASTContext &Ctx,
} else if (FromType->isIntegralType(Ctx) && ToType->isRealFloatingType()) {
llvm::APSInt IntConstantValue;
const Expr *Initializer = IgnoreNarrowingConversion(Converted);
+ assert(Initializer && "Unknown conversion expression");
// If it's value-dependent, we can't tell whether it's narrowing.
if (Initializer->isValueDependent())
return NK_Dependent_Narrowing;
- if (Initializer &&
- Initializer->isIntegerConstantExpr(IntConstantValue, Ctx)) {
+ if (Initializer->isIntegerConstantExpr(IntConstantValue, Ctx)) {
// Convert the integer to the floating type.
llvm::APFloat Result(Ctx.getFloatTypeSemantics(ToType));
Result.convertFromAPInt(IntConstantValue, IntConstantValue.isSigned(),
OpenPOWER on IntegriCloud