diff --git a/clang/tools/libclang/CIndex.cpp b/clang/tools/libclang/CIndex.cpp
index 5462e94f2822..8cc1124f42ce 100644
--- a/clang/tools/libclang/CIndex.cpp
+++ b/clang/tools/libclang/CIndex.cpp
@@ -3594,7 +3594,8 @@ CXEvalResult clang_Cursor_Evaluate(CXCursor C) {
       expr = Field->getInClassInitializer();
     }
     if (expr)
-      return (CXEvalResult)evaluateExpr((Expr *)expr, C);
+      return const_cast<CXEvalResult>(reinterpret_cast<const void *>(
+          evaluateExpr(const_cast<Expr *>(expr), C)));
     return nullptr;
   }
 
@@ -3607,7 +3608,8 @@ CXEvalResult clang_Cursor_Evaluate(CXCursor C) {
       }
     }
     if (expr)
-      return (CXEvalResult)evaluateExpr(expr, C);
+      return const_cast<CXEvalResult>(
+          reinterpret_cast<const void *>(evaluateExpr(expr, C)));
   }
   return nullptr;
 }