projects
/
IRC.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
42e3275
)
bug
author
bdemsky
<bdemsky>
Wed, 3 Nov 2010 10:52:58 +0000
(10:52 +0000)
committer
bdemsky
<bdemsky>
Wed, 3 Nov 2010 10:52:58 +0000
(10:52 +0000)
Robust/src/IR/Flat/RuntimeConflictResolver.java
patch
|
blob
|
history
diff --git
a/Robust/src/IR/Flat/RuntimeConflictResolver.java
b/Robust/src/IR/Flat/RuntimeConflictResolver.java
index aeaa40509dd694f342fae826729e2ec4b5b44424..e289a6dafd515358a8a2cbb10c91c72a8c81b1c6 100644
(file)
--- a/
Robust/src/IR/Flat/RuntimeConflictResolver.java
+++ b/
Robust/src/IR/Flat/RuntimeConflictResolver.java
@@
-756,7
+756,7
@@
public class RuntimeConflictResolver {
}
String strrcr=taint.isRBlockTaint()?"&record->rcrRecords["+index+"], ":"NULL, ";
- String tasksrc=taint.isRBlockTaint()?"(SESEcommon *) record, ":"(SESEcommon *)(((INTPTR)record)
&
1LL), ";
+ String tasksrc=taint.isRBlockTaint()?"(SESEcommon *) record, ":"(SESEcommon *)(((INTPTR)record)
|
1LL), ";
//Do call if we need it.
if(primConfWrite||objConfWrite) {