Merge, from branches/COMEM, revisions 13139 to 13235.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13236

diff --cc cachegrind/cg_main.c
Simple merge

diff --cc lackey/lk_main.c
index 735bc3af1d0dc37e1c1dc862bb323730c4733aa8,28500567e75e068a92f2d8c33bc46d580d61b7ba..486fa2704ad87e57c8ef780e12b46f0d726fa441
--- 1/lackey/lk_main.c
--- 2/lackey/lk_main.c
+++ b/lackey/lk_main.c
@@@ -826,14 -900,11 +901,14 @@@ IRSB* lk_instrument ( VgCallbackClosure
              if (st->Ist.LLSC.storedata == NULL) {
                 /* LL */
                 dataTy = typeOfIRTemp(tyenv, st->Ist.LLSC.result);
 -               if (clo_trace_mem)
 +               if (clo_trace_mem) {
                    addEvent_Dr( sbOut, st->Ist.LLSC.addr,
                                        sizeofIRType(dataTy) );
 +                  /* flush events before LL, helps SC to succeed */
 +                  flushEvents(sbOut);
 +             }
                 if (clo_detailed_counts)
-                   instrument_detail( sbOut, OpLoad, dataTy );
+                   instrument_detail( sbOut, OpLoad, dataTy, NULL/*guard*/ );
              } else {
                 /* SC */
                 dataTy = typeOfIRExpr(tyenv, st->Ist.LLSC.storedata);

diff --cc memcheck/mc_translate.c
Simple merge