From 6b2f3e07c62c5e20fecf8e3863076271000e0f83 Mon Sep 17 00:00:00 2001 From: Davide Italiano Date: Tue, 27 Nov 2018 16:40:21 +0000 Subject: [PATCH] Catch up with EvaluateAsInt() clang API change. llvm-svn: 347673 --- lldb/source/Symbol/ClangASTContext.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lldb/source/Symbol/ClangASTContext.cpp b/lldb/source/Symbol/ClangASTContext.cpp index f136310..e19607e 100644 --- a/lldb/source/Symbol/ClangASTContext.cpp +++ b/lldb/source/Symbol/ClangASTContext.cpp @@ -5965,10 +5965,10 @@ GetObjCFieldAtIndex(clang::ASTContext *ast, if (is_bitfield && ast) { clang::Expr *bitfield_bit_size_expr = ivar_pos->getBitWidth(); - clang::Expr::EvalResult result; + llvm::APSInt bitfield_apsint; if (bitfield_bit_size_expr && - bitfield_bit_size_expr->EvaluateAsInt(result, *ast)) { - llvm::APSInt bitfield_apsint = result.Val.getInt(); + bitfield_bit_size_expr->EvaluateAsInt(bitfield_apsint, + *ast)) { *bitfield_bit_size_ptr = bitfield_apsint.getLimitedValue(); } } @@ -6025,11 +6025,10 @@ CompilerType ClangASTContext::GetFieldAtIndex(lldb::opaque_compiler_type_t type, if (is_bitfield) { clang::Expr *bitfield_bit_size_expr = field->getBitWidth(); - clang::Expr::EvalResult result; + llvm::APSInt bitfield_apsint; if (bitfield_bit_size_expr && - bitfield_bit_size_expr->EvaluateAsInt(result, + bitfield_bit_size_expr->EvaluateAsInt(bitfield_apsint, *getASTContext())) { - llvm::APSInt bitfield_apsint = result.Val.getInt(); *bitfield_bit_size_ptr = bitfield_apsint.getLimitedValue(); } } -- 2.7.4