Revert 347365, its prerequisite 347364 got reverted.

llvm-svn: 347391
This commit is contained in:
Nico Weber 2018-11-21 12:50:13 +00:00
parent 63992b02d0
commit 1742ba5a2d
1 changed files with 5 additions and 6 deletions

View File

@ -5963,10 +5963,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();
}
}
@ -6023,11 +6023,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();
}
}