|
From: <sv...@va...> - 2017-03-13 23:34:58
|
Author: iraisr
Date: Mon Mar 13 23:34:51 2017
New Revision: 16271
Log:
Fix initialization of MCEnv in Memcheck.
At this point, also all tests under 'memcheck' pass as in trunk.
Modified:
branches/VALGRIND_JIT_HACKS/memcheck/mc_translate.c
Modified: branches/VALGRIND_JIT_HACKS/memcheck/mc_translate.c
==============================================================================
--- branches/VALGRIND_JIT_HACKS/memcheck/mc_translate.c (original)
+++ branches/VALGRIND_JIT_HACKS/memcheck/mc_translate.c Mon Mar 13 23:34:51 2017
@@ -332,7 +332,7 @@
{
IRStmtVec* stmts_out = emptyIRStmtVec();
stmts_out->tyenv = deepCopyIRTypeEnv(stmts_in->tyenv);
- stmts_out->parent = parent_mce->stmts;
+ stmts_out->parent = (parent_mce != NULL) ? parent_mce->stmts : NULL;
mce->stmts = stmts_out;
mce->tyenv = stmts_out->tyenv;
@@ -6670,6 +6670,7 @@
MCEnv mce;
initMCEnv(sb_in->stmts, &mce, NULL);
mce.settings = &settings;
+ sb_out->stmts = mce.stmts;
tl_assert(isFlatIRSB(sb_in));
|