Merge cleanup code from Brian N.

diff --git a/scanalysis.cc b/scanalysis.cc
index 288aa498c72801f1326fa8c986bc3d77afbbca64..ff7854a87e8a31aec8e3ae105d403ad0b3559c66 100644 (file)
--- a/scanalysis.cc
+++ b/scanalysis.cc
@@ -228,12 +228,6 @@ void SCAnalysis::computeCV(action_list_t *list) {
                                ClockVector *finishcv = cvmap->get(finish);
                                changed |= (finishcv == NULL) || merge(cv, act, finishcv);
                        }
-                       if (act->is_thread_join()) {
-                               Thread *joinedthr = act->get_thread_operand();
-                               ModelAction *finish = model->get_last_action(joinedthr->get_id());
-                               ClockVector *finishcv = cvmap->get(finish);
-                               changed |= (finishcv == NULL) || cv->merge(finishcv);
-                       }
                        if (act->is_read()) {
                                changed|=processRead(act, cv);
                        }