From c9972c717b06b7bb01cb663e18c66e953f7f2574 Mon Sep 17 00:00:00 2001 From: bdemsky Date: Wed, 10 Nov 2010 02:03:34 +0000 Subject: [PATCH] be more careful about moving check...could break stuff in the future accidentally if we do this... --- Robust/src/IR/Flat/RuntimeConflictResolver.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Robust/src/IR/Flat/RuntimeConflictResolver.java b/Robust/src/IR/Flat/RuntimeConflictResolver.java index f5ff473a..c94f2e78 100644 --- a/Robust/src/IR/Flat/RuntimeConflictResolver.java +++ b/Robust/src/IR/Flat/RuntimeConflictResolver.java @@ -817,16 +817,17 @@ public class RuntimeConflictResolver { String tasksrc=taint.isRBlockTaint()?"(SESEcommon *) record, ":"(SESEcommon *)(((INTPTR)record)|1LL), "; - //int heaprootNum = connectedHRHash.get(taint).id; // YUCKY HACK FOR NOW, ALWAYS USE ONE HASH TABLE // (CONSVERATIVELY PUT ALL PARAMS INTO ONE CONNECTED COMPONENT) // UNTIL WE FIGURE OUT WHY YOU SOMETIMES GET DIFFERENT // heaprootNum VALUES WHEN THEY SHOULD BE THE SAME + // We should use the commented lines in the if statements... int heaprootNum = 0; - assert heaprootNum != -1; //Do call if we need it. if(primConfWrite||objConfWrite) { + //int heaprootNum = connectedHRHash.get(taint).id; + assert heaprootNum != -1; int allocSiteID = connectedHRHash.get(taint).getWaitingQueueBucketNum(curr); int traverserID = doneTaints.get(taint); currCase.append(" int tmpkey"+depth+"=rcr_generateKey("+prefix+");\n"); @@ -835,6 +836,8 @@ public class RuntimeConflictResolver { else currCase.append(" int tmpvar"+depth+"=rcr_WRITEBINCASE(allHashStructures["+heaprootNum+"], tmpkey"+depth+", "+ tasksrc+strrcr+index+");\n"); } else if (primConfRead||objConfRead) { + //int heaprootNum = connectedHRHash.get(taint).id; + assert heaprootNum != -1; int allocSiteID = connectedHRHash.get(taint).getWaitingQueueBucketNum(curr); int traverserID = doneTaints.get(taint); currCase.append(" int tmpkey"+depth+"=rcr_generateKey("+prefix+");\n"); -- 2.34.1