[Libreoffice-commits] core.git: compilerplugins/clang

[Libreoffice Gerrit user]

 compilerplugins/clang/compat.hxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit da9fb5d6d9ebf9363981c370ce937d8848989fcb
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Nov 28 12:36:29 2018 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Nov 29 07:17:07 2018 +0100

    comment out the EvaluateAsInt compat code for now
    
    sberg: Note how that Clang change keeps getting reverted; latest one is
    <http://llvm.org/viewvc/llvm-project?view=revision&revision=347656>
    "Revert r347417 'Re-Reinstate 347294 with a fix for the failures.'"  But
    lets wait a little while to see how things settle there.
    
    Change-Id: I05b34ca1377792bcb4c557defd3e9b5d11ee2b14
    Reviewed-on: https://gerrit.libreoffice.org/64168
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/compilerplugins/clang/compat.hxx b/compilerplugins/clang/compat.hxx
index 97410fcbdc7a..7a518770a3b6 100644
--- a/compilerplugins/clang/compat.hxx
+++ b/compilerplugins/clang/compat.hxx
@@ -157,7 +157,8 @@ inline bool CPlusPlus17(clang::LangOptions const & opts) {
 }
 
 inline bool EvaluateAsInt(clang::Expr const * expr, llvm::APSInt& intRes, const clang::ASTContext& ctx) {
-#if CLANG_VERSION >= 80000
+// this keeps getting landed and then reverted in clang
+#if 0 && CLANG_VERSION >= 80000
     clang::Expr::EvalResult res;
     bool b = expr->EvaluateAsInt(res, ctx);
     if (b && res.Val.isInt())