summaryrefslogtreecommitdiff
path: root/compilerplugins/clang/compat.hxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-11-29 09:54:32 +0100
committerStephan Bergmann <sbergman@redhat.com>2018-11-29 09:56:10 +0100
commitb9c9c70157e7bc5b868437ab6bda2b21ba34c627 (patch)
treec63860a92337ac0ec14ba4e0b564cf9477ac42cf /compilerplugins/clang/compat.hxx
parent62623f7604df0437316c101803098760f4fe4651 (diff)
Revert "comment out the EvaluateAsInt compat code for now"
This reverts commit da9fb5d6d9ebf9363981c370ce937d8848989fcb, obsoleted by <http://llvm.org/viewvc/llvm-project?view=revision&revision=347756> "Re-commit r347417 'Re-Reinstate 347294 with a fix for the failures.'"
Diffstat (limited to 'compilerplugins/clang/compat.hxx')
-rw-r--r--compilerplugins/clang/compat.hxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/compilerplugins/clang/compat.hxx b/compilerplugins/clang/compat.hxx
index 7a518770a3b6..97410fcbdc7a 100644
--- a/compilerplugins/clang/compat.hxx
+++ b/compilerplugins/clang/compat.hxx
@@ -157,8 +157,7 @@ inline bool CPlusPlus17(clang::LangOptions const & opts) {
}
inline bool EvaluateAsInt(clang::Expr const * expr, llvm::APSInt& intRes, const clang::ASTContext& ctx) {
-// this keeps getting landed and then reverted in clang
-#if 0 && CLANG_VERSION >= 80000
+#if CLANG_VERSION >= 80000
clang::Expr::EvalResult res;
bool b = expr->EvaluateAsInt(res, ctx);
if (b && res.Val.isInt())