Fixed an expression parser bug that prevented
certain functions from being resolved correctly.
Some functions (particularly varargs functions)
are BitCast before being called, and the problem
was that a CallInst where getCalledValue()
returned a BitCast ConstantExpr was not being
relocated at all.
This problem should now be resolved for the case
of BitCast.
git-svn-id: https://llvm.org/svn/llvm-project/llvdb/trunk@113396 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/source/Expression/ClangFunction.cpp b/source/Expression/ClangFunction.cpp
index 3044d51..7e0f531 100644
--- a/source/Expression/ClangFunction.cpp
+++ b/source/Expression/ClangFunction.cpp
@@ -460,8 +460,14 @@
if (call_plan_sp == NULL)
return eExecutionSetupError;
+//#define SINGLE_STEP_EXPRESSIONS
+
+#ifdef SINGLE_STEP_EXPRESSIONS
+ return eExecutionInterrupted;
+#else
call_plan_sp->SetPrivate(true);
exe_ctx.thread->QueueThreadPlan(call_plan_sp, true);
+#endif
// We need to call the function synchronously, so spin waiting for it to return.
// If we get interrupted while executing, we're going to lose our context, and
diff --git a/source/Expression/IRDynamicChecks.cpp b/source/Expression/IRDynamicChecks.cpp
index f2ce5b2..0f98123 100644
--- a/source/Expression/IRDynamicChecks.cpp
+++ b/source/Expression/IRDynamicChecks.cpp
@@ -343,6 +343,18 @@
if (!vpc.Instrument())
return false;
+ if (log)
+ {
+ std::string s;
+ raw_string_ostream oss(s);
+
+ M.print(oss, NULL);
+
+ oss.flush();
+
+ log->Printf("Module after dynamic checks: \n%s", s.c_str());
+ }
+
return true;
}
diff --git a/source/Expression/IRForTarget.cpp b/source/Expression/IRForTarget.cpp
index 345ae34..e220b16 100644
--- a/source/Expression/IRForTarget.cpp
+++ b/source/Expression/IRForTarget.cpp
@@ -579,7 +579,23 @@
Function *fun = C->getCalledFunction();
if (fun == NULL)
- return true;
+ {
+ Value *val = C->getCalledValue();
+
+ ConstantExpr *const_expr = dyn_cast<ConstantExpr>(val);
+
+ if (const_expr && const_expr->getOpcode() == Instruction::BitCast)
+ {
+ fun = dyn_cast<Function>(const_expr->getOperand(0));
+
+ if (!fun)
+ return true;
+ }
+ else
+ {
+ return true;
+ }
+ }
clang::NamedDecl *fun_decl = DeclForGlobalValue(M, fun);
uint64_t fun_addr;