changes for new language support

wala · Oct 25, 2015 · 849177f · 849177f
1 parent 556d8ff
commit 849177f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AstTranslator.java b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AstTranslator.java
@@ -1057,7 +1057,7 @@ public void addEdge(PreBasicBlock src, PreBasicBlock dst) {
       deadBlocks.remove(dst);
     }
 
-    boolean isDeadBlock(PreBasicBlock block) {
+    public boolean isDeadBlock(PreBasicBlock block) {
       return deadBlocks.contains(block);
     }
 
@@ -3387,7 +3387,7 @@ protected WalkContext makeUnwindContext(WalkContext context, CAstNode n, CAstVis
     return new UnwindContext(n, context, visitor);
   }
 
-  private Map<CAstEntity, Set<String>> entity2ExposedNames;
+  protected Map<CAstEntity, Set<String>> entity2ExposedNames;
   protected int processFunctionExpr(CAstNode n, WalkContext context) {
     CAstEntity fn = (CAstEntity) n.getChild(0).getValue();
     declareFunction(fn, context);

diff --git a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/AstDynamicPropertyClass.java b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/AstDynamicPropertyClass.java
@@ -33,10 +33,11 @@ protected AstDynamicPropertyClass(CAstSourcePositionMap.Position sourcePosition,
 
   @Override
   public IField getField(final Atom name) {
+    IField x;
     if (declaredFields.containsKey(name)) {
       return declaredFields.get(name);
-    } else if (getSuperclass() != null) {
-      return getSuperclass().getField(name);
+    } else if (getSuperclass() != null && (x = getSuperclass().getField(name)) != null) {
+      return x;
     } else {
       final boolean isStatic = isStaticField(name);
       declaredFields.put(name, new AstDynamicField(isStatic, this, name, defaultDescriptor));

diff --git a/...a.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/ejc/EJCSourceModuleTranslator.java b/...a.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/ejc/EJCSourceModuleTranslator.java
@@ -158,6 +158,7 @@ private Pair<String[],String[]> computeClassPath(AnalysisScope scope) {
    * Project -> AST code from org.eclipse.jdt.core.tests.performance
    */
 
+  @SuppressWarnings("unchecked")
   @Override
   public void loadAllSources(Set<ModuleEntry> modules) {
     List<String> sources = new LinkedList<String>();