diff options
author | Bill Wendling <isanbard@gmail.com> | 2018-11-21 20:44:18 +0000 |
---|---|---|
committer | Bill Wendling <isanbard@gmail.com> | 2018-11-21 20:44:18 +0000 |
commit | 6ff1751f7d330191a2035144cabf7fa3cb232928 (patch) | |
tree | caa6155185901ee503e07efa16d122487df768b6 /clang/lib/Sema/SemaCast.cpp | |
parent | 74fb1631840abda6de42929c4cdac0528f4cba3f (diff) | |
download | bcm5719-llvm-6ff1751f7d330191a2035144cabf7fa3cb232928.tar.gz bcm5719-llvm-6ff1751f7d330191a2035144cabf7fa3cb232928.zip |
Re-Reinstate 347294 with a fix for the failures.
Don't try to emit a scalar expression for a non-scalar argument to
__builtin_constant_p().
Third time's a charm!
llvm-svn: 347417
Diffstat (limited to 'clang/lib/Sema/SemaCast.cpp')
-rw-r--r-- | clang/lib/Sema/SemaCast.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/clang/lib/Sema/SemaCast.cpp b/clang/lib/Sema/SemaCast.cpp index 3b49f9315f8..0b4645e11c3 100644 --- a/clang/lib/Sema/SemaCast.cpp +++ b/clang/lib/Sema/SemaCast.cpp @@ -2554,8 +2554,9 @@ void CastOperation::CheckCStyleCast() { // OpenCL v2.0 s6.13.10 - Allow casts from '0' to event_t type. if (Self.getLangOpts().OpenCL && DestType->isEventT()) { - llvm::APSInt CastInt; - if (SrcExpr.get()->EvaluateAsInt(CastInt, Self.Context)) { + Expr::EvalResult Result; + if (SrcExpr.get()->EvaluateAsInt(Result, Self.Context)) { + llvm::APSInt CastInt = Result.Val.getInt(); if (0 == CastInt) { Kind = CK_ZeroToOCLOpaqueType; return; |