diff --git a/lldb/source/Expression/IRInterpreter.cpp b/lldb/source/Expression/IRInterpreter.cpp --- a/lldb/source/Expression/IRInterpreter.cpp +++ b/lldb/source/Expression/IRInterpreter.cpp @@ -285,9 +285,11 @@ return true; // no offset to apply! SmallVector indices(op_cursor, op_end); - Type *src_elem_ty = cast(constant_expr)->getSourceElementType(); + + // DataLayout::getIndexedOffsetInType assumes the indices are + // instances of ConstantInt. uint64_t offset = m_target_data.getIndexedOffsetInType(src_elem_ty, indices); @@ -466,12 +468,20 @@ case Instruction::BitCast: return CanResolveConstant(constant_expr->getOperand(0)); case Instruction::GetElementPtr: { + // Check that the base can be constant-resolved. ConstantExpr::const_op_iterator op_cursor = constant_expr->op_begin(); Constant *base = dyn_cast(*op_cursor); - if (!base) + if (!base || !CanResolveConstant(base)) return false; - return CanResolveConstant(base); + // Check that all other operands are just ConstantInt. + for (Value *op : make_range(constant_expr->op_begin() + 1, + constant_expr->op_end())) { + ConstantInt *constant_int = dyn_cast(op); + if (!constant_int) + return false; + } + return true; } } } else { diff --git a/lldb/test/API/lang/cpp/static_members/TestCPPStaticMembers.py b/lldb/test/API/lang/cpp/static_members/TestCPPStaticMembers.py --- a/lldb/test/API/lang/cpp/static_members/TestCPPStaticMembers.py +++ b/lldb/test/API/lang/cpp/static_members/TestCPPStaticMembers.py @@ -41,3 +41,31 @@ self.createTestTarget() self.expect("expression s_c", error=True, startstr="error: use of undeclared identifier 's_d'") + + def test_no_crash_in_IR_arithmetic(self): + """ + Test that LLDB doesn't crash on evaluating specific expression involving + pointer arithmetic and taking the address of a static class member. + See https://bugs.llvm.org/show_bug.cgi?id=52449 + """ + self.build() + lldbutil.run_to_source_breakpoint(self, "// stop in main", lldb.SBFileSpec("main.cpp")) + + # This expression contains the following IR code: + # ... i64 ptrtoint (i32* @_ZN1A3s_cE to i64)) ... + expr = "(int*)100 + (long long)(&A::s_c)" + + # The IR interpreter doesn't support non-const operands to the + # `GetElementPtr` IR instruction, so verify that it correctly fails to + # evaluate expression. + opts = lldb.SBExpressionOptions() + opts.SetAllowJIT(False) + value = self.target().EvaluateExpression(expr, opts) + self.assertTrue(value.GetError().Fail()) + self.assertIn( + "Can't evaluate the expression without a running target", + value.GetError().GetCString()) + + # Evaluating the expression via JIT should work fine. + value = self.target().EvaluateExpression(expr) + self.assertSuccess(value.GetError())