From: bdemsky <bdemsky>
Date: Wed, 20 Aug 2008 00:59:14 +0000 (+0000)
Subject: changes
X-Git-Tag: buildscript^6~96
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=595c617d03db8a6619c33c2608febb7b2c2b89f4;p=IRC.git

changes
---

diff --git a/Robust/src/IR/Flat/BuildCode.java b/Robust/src/IR/Flat/BuildCode.java
index 298c4084..52ac05e7 100644
--- a/Robust/src/IR/Flat/BuildCode.java
+++ b/Robust/src/IR/Flat/BuildCode.java
@@ -1670,7 +1670,11 @@ public class BuildCode {
       output.println(generateTemp(fm, fgcn.getSrc(),lb)+"=(void *)transRead(trans, (unsigned int) "+generateTemp(fm, fgcn.getSrc(),lb)+");");
     } else {
       /* Need to convert to OID */
-      output.println(generateTemp(fm, fgcn.getSrc(),lb)+"=(void *)COMPOID("+generateTemp(fm, fgcn.getSrc(),lb)+");");
+      if (fgcn.doConvert()) {
+	output.println(generateTemp(fm, fgcn.getSrc(),lb)+"=(void *)COMPOID("+generateTemp(fm, fgcn.getSrc(),lb)+");");
+      } else {
+	output.println(generateTemp(fm, fgcn.getSrc(),lb)+"=NULL;");
+      }
     }
   }
 
diff --git a/Robust/src/IR/Flat/FlatGlobalConvNode.java b/Robust/src/IR/Flat/FlatGlobalConvNode.java
index d3b5d107..d536ad6a 100644
--- a/Robust/src/IR/Flat/FlatGlobalConvNode.java
+++ b/Robust/src/IR/Flat/FlatGlobalConvNode.java
@@ -6,6 +6,7 @@ public class FlatGlobalConvNode extends FlatNode {
   TempDescriptor src;
   LocalityBinding lb;
   boolean makePtr;
+  boolean doactualconvert=true;
 
   public FlatGlobalConvNode(TempDescriptor src, LocalityBinding lb, boolean makePtr) {
     this.src=src;
@@ -13,6 +14,17 @@ public class FlatGlobalConvNode extends FlatNode {
     this.makePtr=makePtr;
   }
 
+  public FlatGlobalConvNode(TempDescriptor src, LocalityBinding lb, boolean makePtr, boolean doactualconvert) {
+    this.src=src;
+    this.lb=lb;
+    this.makePtr=makePtr;
+    this.convert=doactualconvert;
+  }
+
+  boolean doConvert() {
+    return convert;
+  }
+
   public String toString() {
     String str = "FlatGlobalConvNode_"+src.toString();
     if (makePtr)