From: jzhou Date: Mon, 3 Oct 2011 23:31:14 +0000 (+0000) Subject: Changes for galois porting X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=59c0aa9720e8247ac80434d40e373e320bf7c9c7;p=IRC.git Changes for galois porting --- diff --git a/Robust/src/IR/Tree/BuildIR.java b/Robust/src/IR/Tree/BuildIR.java index b95f781c..57279658 100644 --- a/Robust/src/IR/Tree/BuildIR.java +++ b/Robust/src/IR/Tree/BuildIR.java @@ -979,6 +979,7 @@ public class BuildIR { return con; } else if (isNode(pn,"createobjectcls")) { //TODO::: FIX BUG!!! static fields in caller context need to become parameters + //TODO::: caller context need to be passed in here TypeDescriptor td=parseTypeDescriptor(pn); innerCount++; ClassDescriptor cnnew=new ClassDescriptor(packageName,td.getSymbol()+"$"+innerCount, false); diff --git a/Robust/src/IR/TypeUtil.java b/Robust/src/IR/TypeUtil.java index 4b9fac3a..e40b1d04 100644 --- a/Robust/src/IR/TypeUtil.java +++ b/Robust/src/IR/TypeUtil.java @@ -407,6 +407,10 @@ NextMethod: return false; } + + // Object is superclass of interfaces + if(possiblesuper.getSymbol().equals(ObjectClass)&&cd2.isClass()&&cd2.getClassDesc().isInterface()) + return true; if (possiblesuper.isClass()&& cd2.isClass())