summaryrefslogtreecommitdiffstats
path: root/clang/lib/Sema/SemaInit.cpp
diff options
context:
space:
mode:
authorNico Weber <nicolasweber@gmx.de>2018-11-21 12:47:43 +0000
committerNico Weber <nicolasweber@gmx.de>2018-11-21 12:47:43 +0000
commit9f0246d47390775ec3bf2c2b7e4ded3d26193468 (patch)
treeb04d1324ec67a7b17d8824779c13deb94dac2812 /clang/lib/Sema/SemaInit.cpp
parent4923930be5367488be818168916ad94dc878bb59 (diff)
downloadbcm5719-llvm-9f0246d47390775ec3bf2c2b7e4ded3d26193468.tar.gz
bcm5719-llvm-9f0246d47390775ec3bf2c2b7e4ded3d26193468.zip
Revert r347364 again, the fix was incomplete.
llvm-svn: 347389
Diffstat (limited to 'clang/lib/Sema/SemaInit.cpp')
-rw-r--r--clang/lib/Sema/SemaInit.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/clang/lib/Sema/SemaInit.cpp b/clang/lib/Sema/SemaInit.cpp
index 12946060084..3184be80386 100644
--- a/clang/lib/Sema/SemaInit.cpp
+++ b/clang/lib/Sema/SemaInit.cpp
@@ -8050,9 +8050,8 @@ ExprResult InitializationSequence::Perform(Sema &S,
break;
}
- Expr::EvalResult EVResult;
- Init->EvaluateAsInt(EVResult, S.Context);
- llvm::APSInt Result = EVResult.Val.getInt();
+ llvm::APSInt Result;
+ Init->EvaluateAsInt(Result, S.Context);
const uint64_t SamplerValue = Result.getLimitedValue();
// 32-bit value of sampler's initializer is interpreted as
// bit-field with the following structure:
OpenPOWER on IntegriCloud