+ addNodeEdge(fromnode, tonode);
+}
+
+/**
+ * @return false if the resolution results in a cycle; true otherwise
+ */
+bool CycleGraph::resolvePromise(ModelAction *reader, ModelAction *writer,
+ promise_list_t *mustResolve)
+{
+ CycleNode *promise_node = readerToPromiseNode.get(reader);
+ CycleNode *w_node = actionToNode.get(writer);
+ ASSERT(promise_node);
+
+ if (w_node)
+ return mergeNodes(w_node, promise_node, mustResolve);
+ /* No existing write-node; just convert the promise-node */
+ promise_node->resolvePromise(writer);
+ readerToPromiseNode.put(reader, NULL); /* erase promise_node */
+ putNode(writer, promise_node);
+ return true;
+}
+
+/**
+ * @brief Merge two CycleNodes that represent the same write
+ *
+ * Note that this operation cannot be rolled back.
+ *
+ * @param w_node The write ModelAction node with which to merge
+ * @param p_node The Promise node to merge. Will be destroyed after this
+ * function.
+ * @param mustMerge Return (pass-by-reference) any additional Promises that
+ * must also be merged with w_node
+ *
+ * @return false if the merge results in a cycle; true otherwise
+ */
+bool CycleGraph::mergeNodes(CycleNode *w_node, CycleNode *p_node,
+ promise_list_t *mustMerge)
+{
+ ASSERT(!w_node->is_promise());
+ ASSERT(p_node->is_promise());
+ const Promise *promise = p_node->getPromise();
+ if (!promise->is_compatible(w_node->getAction())) {
+ hasCycles = true;
+ return false;