From 37eea27f4a7121091244dccfb9fb1280e35a6230 Mon Sep 17 00:00:00 2001
From: Julian Dolby <juliandolby@gmail.com>
Date: Fri, 22 Jun 2018 19:49:49 -0400
Subject: [PATCH] more support for out-of-order lexical declarations

---
 .../cast/ir/translator/AstTranslator.java     | 27 ++++++++++++++++---
 1 file changed, 24 insertions(+), 3 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
index ca09714c7..9604c7326 100644
--- 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
@@ -207,6 +207,13 @@ public abstract class AstTranslator extends CAstVisitor<AstTranslator.WalkContex
    */
   protected abstract CAstType exceptionType();
   
+  /**
+   * lift variable declarations for lexical scoping purposes?
+   */
+  protected boolean liftDeclarationsForLexicalScoping() {
+    return false;
+  }
+  
   /**
    * used to generate instructions for array operations; defaults to this
    */
@@ -3303,7 +3310,7 @@ public abstract class AstTranslator extends CAstVisitor<AstTranslator.WalkContex
       declareFunction(n, context);
     else {
       declareFunction(n, context);
-      initFunctionEntity(codeContext);
+      initFunctionEntity(n, codeContext);
     }
     return false;
   }
@@ -3322,7 +3329,7 @@ public abstract class AstTranslator extends CAstVisitor<AstTranslator.WalkContex
   @Override
   protected boolean visitScriptEntity(CAstEntity n, WalkContext context, WalkContext codeContext, CAstVisitor<WalkContext> visitor) {
     declareFunction(n, codeContext);
-    initFunctionEntity(codeContext);
+    initFunctionEntity(n, codeContext);
     return false;
   }
 
@@ -3331,7 +3338,15 @@ public abstract class AstTranslator extends CAstVisitor<AstTranslator.WalkContex
     closeFunctionEntity(n, context, codeContext);
   }
 
-  public void initFunctionEntity(WalkContext functionContext) {
+  public void initFunctionEntity(CAstEntity n, WalkContext functionContext) {
+    if (liftDeclarationsForLexicalScoping()) {
+      Set<String> names = entity2ExposedNames.get(n);
+      if (names != null) {
+        names.forEach((String nm) -> {
+          functionContext.currentScope().declare(new CAstSymbolImpl(nm, CAstType.DYNAMIC));
+        });
+      }
+    }
     // entry block
     functionContext.cfg().makeEntryBlock(functionContext.cfg().newBlock(false));
     // first real block
@@ -4909,6 +4924,9 @@ public abstract class AstTranslator extends CAstVisitor<AstTranslator.WalkContex
     // this.inlinedSourceMap = inlinedSourceMap;
     final ExposedNamesCollector exposedNamesCollector = new ExposedNamesCollector();
     exposedNamesCollector.run(N);
+    if (liftDeclarationsForLexicalScoping()) {
+      exposedNamesCollector.run(N);      
+    }
     entity2ExposedNames = exposedNamesCollector.getEntity2ExposedNames();
     // CAstEntity rewrite = (new ExposedParamRenamer(new CAstImpl(),
     // entity2ExposedNames)).rewrite(N);
@@ -4918,6 +4936,9 @@ public abstract class AstTranslator extends CAstVisitor<AstTranslator.WalkContex
   public void translate(final CAstEntity N, final WalkContext context) {
     final ExposedNamesCollector exposedNamesCollector = new ExposedNamesCollector();
     exposedNamesCollector.run(N);
+    if (liftDeclarationsForLexicalScoping()) {
+      exposedNamesCollector.run(N);      
+    }
     entity2ExposedNames = exposedNamesCollector.getEntity2ExposedNames();
     walkEntities(N, context);
   }