From: Julian Seward <jseward@acm.org>
Date: Thu, 17 Jan 2013 14:24:35 +0000 (+0000)
Subject: Merge, from branches/COMEM, revisions 13139 to 13235.
X-Git-Tag: svn/VALGRIND_3_9_0~445
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=661c1c2b7b223413835f7c60c35f707aada258bb;p=thirdparty%2Fvalgrind.git

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


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

661c1c2b7b223413835f7c60c35f707aada258bb
diff --cc lackey/lk_main.c
index 735bc3af1d,28500567e7..486fa2704a
--- a/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);