From: root <root@dw-6.eecs.uci.edu>
Date: Wed, 19 Jun 2019 20:52:43 +0000 (-0700)
Subject: merge
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5d0368dd546d03580ae69f8058a3a4fdc31de83b;p=c11tester.git

merge
---

5d0368dd546d03580ae69f8058a3a4fdc31de83b
diff --cc action.cc
index 9c0e2992,4e3b59a3..cfdb6e67
--- a/action.cc
+++ b/action.cc
@@@ -465,7 -429,7 +465,8 @@@ uint64_t ModelAction::get_reads_from_va
  	ASSERT(is_read());
  	if (reads_from)
  		return reads_from->get_write_value();
 -	return VALUE_NONE; /* Only for new actions with no reads-from */
++
 +	return VALUE_NONE;	// Only for new actions with no reads-from
  }
  
  /**